OSDN Git Service

Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev...
authorJesse Hall <jessehall@google.com>
Tue, 17 Jan 2017 22:17:48 +0000 (22:17 +0000)
committerandroid-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