OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
40cd637
d5e8f47
)
Merge "EGL: Add EGL_GL_scrgb extension" into oc-dr1-dev
author
Courtney Goeltzenleuchter
<courtneygo@google.com>
Wed, 2 Aug 2017 19:33:33 +0000
(19:33 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 2 Aug 2017 19:33:33 +0000
(19:33 +0000)
am:
d5e8f47eff
-s ours
Change-Id: Ifa3a705354ca92a5cc091d872bd5fff5b2512e7c
Trivial merge