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-03-12 09:13:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-12 09:13:04 +0000
commit0be3fc8477922a6f5a148b57541f87310bed08c8 (patch)
tree98e3c8b2597645688238b730afb6e299e7384da2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9df9b32b95bb316bd88c4fc139f254f03113aad4 (diff)
parentb73ced79ece78ec6c20cb53065ea7c4513dc78f5 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev am: 834e880978 -s ours am: da2c3df4ce -s ours am: 6e298f6477 am: b73ced79ec -s ours
am skip reason: subject contains skip directive Change-Id: Icc7d750177b6ca1671c447a930ca66557fb47712
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions