summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-05-19 04:35:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-19 04:35:13 +0000
commitb10a4247333e7164ef09d75038fc6cd33c96c81c (patch)
treec482da95aec457bfa9bdd5b5659051700852bcb5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent02652b342e6fd89f3526485289b2cf602f9b9765 (diff)
parentd96711a83e66caae28e1c155c661f5ee95c45f9e (diff)
[automerger skipped] Merge "Revert "Add a null home activity to Shell.apk"" am: fa8eb3f146 am: 2aabf5f792 -s ours am: 4d6ac2e133 -s ours am: d96711a83e -s ours
am skip reason: Change-Id I927b7dae779da25589f2198e0480c0f2a788a7e4 with SHA-1 539298c1b9 is in history Change-Id: I04677f9630bbe821aab8d043045c4d8a06fb7a16
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions