OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1...
authorYahan Zhou <yahan@google.com>
Fri, 11 Nov 2016 22:17:30 +0000 (22:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Nov 2016 22:17:30 +0000 (22:17 +0000)
commit0913dec00d315eae82be2aa477984acfed580873
tree768e14771154e4ce3f2031fcb02fb603c243efd6
parent984acc9061b7ebd792a465b4a37acf334e6c95a0
parent78454be75addd6a5b458b5b980b48778b4342817
Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1-dev am: ff9b220285  -s ours am: ab60271bab  -s ours
am: 78454be75a  -s ours

Change-Id: I3e7a223d68cd9c09d3a89e09cfe6ee778136e72c