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:33:12 +0000 (22:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Nov 2016 22:33:12 +0000 (22:33 +0000)
commit407c46b26625d3aec3f47c0af3195b8ae587be61
treec400efe1466974af9b8c28355920277dc800e4ca
parenta15a392fd7c1db52ea7b3afa23ad09ed97a6fa35
parentd7e8dc892b1cc7158e6d7fedae221d80af9e4f77
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
am: d7e8dc892b  -s ours

Change-Id: I3aa8dddf4571f482028eb873e29b3be2b2340a24