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:
8eb71f4
db334be
)
DO NOT MERGE ANYWHERE Accept EGL_CONTEXT_PRIORITY_LEVEL_IMG am: 3a6d7c961e -s ours
author
Yahan Zhou
<yahan@google.com>
Wed, 23 Nov 2016 22:28:17 +0000
(22:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 23 Nov 2016 22:28:17 +0000
(22:28 +0000)
am:
db334bed50
-s ours
Change-Id: Id2246625716dad271de3dc9ce9f2ba0aff2a3df9
Trivial merge