diff options
| author | Jesse Hall <jessehall@google.com> | 2017-01-17 01:55:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-17 01:55:50 +0000 |
| commit | 49c4983e5599882422c986b7dc5cd109e7f2e83d (patch) | |
| tree | ddce1bed4ef65fc748e018be147b49441225d710 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f4b4c7a4ca9116a32a7c7f361eca0c7ad0dfe0f6 (diff) | |
| parent | 5274672467d75dc74bdb0d8dae3cd6378b3f8df8 (diff) | |
Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev am: a959ccbc33 -s ours
am: 5274672467 -s ours
Change-Id: I37c8b54bc4cfbb6c9a823002a0052ea1ba84e089
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions