OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1...
authorYahan Zhou <yahan@google.com>
Wed, 23 Nov 2016 22:28:28 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:28:28 +0000 (22:28 +0000)
am: ab60271bab  -s ours

Change-Id: I14b8e7ee8e7e7a263ed170c3e595ac51b39bd6c5


Trivial merge