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:30:42 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:30:42 +0000 (22:30 +0000)
commitd7e8dc892b1cc7158e6d7fedae221d80af9e4f77
tree768e14771154e4ce3f2031fcb02fb603c243efd6
parent1e5fd1e94ed834960dee33fa8c9a2ba3b7674b54
parentf09bf909ade06f4acd9663a671fd83c78077c651
Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1-dev am: ff9b220285  -s ours am: ab60271bab  -s ours
am: f09bf909ad  -s ours

Change-Id: I8247229fbca72d4a6b759935909f2e99c21e03b4