OSDN Git Service

DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG am: 3a6d7c961e -s ours...
authorYahan Zhou <yahan@google.com>
Fri, 11 Nov 2016 22:24:21 +0000 (22:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 22:24:21 +0000 (22:24 +0000)
am: 984acc9061  -s ours

Change-Id: I94e1c2dd22c4bac7cc2f478b3bf975c1efa6fc82


Trivial merge