summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-10 14:51:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-10 14:51:51 +0000
commit887b42e449880e42affe63ba867919fbe20f3393 (patch)
treec5ff49df809ad12aef470409c876108cea4675c5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7ebb7da0df8f6929529a5a87e1e26fcde1e5b406 (diff)
parent732b2c88056e2fe22a53ad64d4d9225d4b843602 (diff)
[automerger skipped] Merge "Use new image location for JIT Zygote." am: ada87ea525 am: ad1b60d2bf am: 732b2c8805 -s ours
am skip reason: Change-Id I7add3006b0d72b005daabb6609d954b466985304 with SHA-1 9ac03a0504 is in history Change-Id: Ide72cabafe28ce30a7302a43312f9a2ff31f70a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions