OSDN Git Service
(root)
/
android-x86
/
device-generic-goldfish-opengl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
984acc9
78454be
)
Merge "DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG" into nyc-mr1...
author
Yahan Zhou
<yahan@google.com>
Fri, 11 Nov 2016 22:17:30 +0000
(22:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 Nov 2016 22:17:30 +0000
(22:17 +0000)
am:
78454be75a
-s ours
Change-Id: I3e7a223d68cd9c09d3a89e09cfe6ee778136e72c
Trivial merge