OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4aa1208
3181ba5
)
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev...
author
Jesse Hall
<jessehall@google.com>
Tue, 17 Jan 2017 22:17:48 +0000
(22:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 17 Jan 2017 22:17:48 +0000
(22:17 +0000)
am:
3181ba522d
-s ours
Change-Id: I5cacc647fec776d1016183695106bb3cd6c92ec2
Trivial merge