commit | f09bf909ade06f4acd9663a671fd83c78077c651 | [log] [tgz] |
---|---|---|
author | Yahan Zhou <yahan@google.com> | Wed Nov 23 22:28:28 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Nov 23 22:28:28 2016 +0000 |
tree | 768e14771154e4ce3f2031fcb02fb603c243efd6 | |
parent | 2737782b4da9869d088e7b792a6f85c40def5456 [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: I14b8e7ee8e7e7a263ed170c3e595ac51b39bd6c5