summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-05-19 04:44:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-19 04:44:06 +0000
commit8d55241d5d8aaf449d5c6258f0e43a6bc0a1edca (patch)
tree23acbd7d38c837081f485574613dc4ddb6f60173 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta08321ad2fbbf899d0e60a54a4da4369eef117f3 (diff)
parentb10a4247333e7164ef09d75038fc6cd33c96c81c (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: b10a424733 -s ours
am skip reason: Change-Id I927b7dae779da25589f2198e0480c0f2a788a7e4 with SHA-1 539298c1b9 is in history Change-Id: I5e32c4d3837f906d4c026433b926cb391856f6b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions