summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2017-01-17 22:11:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-17 22:11:26 +0000
commit3181ba522d4125af3fb9a83efb3532b6ec6f5484 (patch)
tree3107191d6433a4a86f011e1b3ba26bcc1ddab169 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent881da84c6b6b7112b165ce433c4d096783227352 (diff)
parent31b755adea8f4aa297ff8da761d46d3b77402179 (diff)
Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev
am: 31b755adea Change-Id: I948e9c9a60327b9d25b6b5712904c780a52fdafa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions