commit | 78454be75addd6a5b458b5b980b48778b4342817 | [log] [tgz] |
---|---|---|
author | Yahan Zhou <yahan@google.com> | Fri Nov 11 22:10:30 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 11 22:10:30 2016 +0000 |
tree | fb956ec409e1aa16f2427500d1f0f895bc395d46 | |
parent | 096235db739fdc9f2526713c7e6d83611f969011 [diff] | |
parent | ab60271bab183c990d82ff5e156a0bfdbda45bd0 [diff] |
Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1-dev am: ff9b220285 -s ours am: ab60271bab -s ours Change-Id: I7ce588a7d17ca2c4658ea4164a7a02fcbf368c52