diff options
| author | Jesse Hall <jessehall@google.com> | 2017-01-14 06:03:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-14 06:03:34 +0000 |
| commit | 5274672467d75dc74bdb0d8dae3cd6378b3f8df8 (patch) | |
| tree | 1ba6f1936e73801bedaa3fc5eaa4d81939101df9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4f6a5b7c43b586d08e49388f3748f7e9832b4e3f (diff) | |
| parent | a959ccbc33c63213e857f91ea8b06ef5d4cc38f3 (diff) | |
Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev
am: a959ccbc33 -s ours
Change-Id: I1ab396d5cfa65efa831ac4c7cfa5ec99fa7849a8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions