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-10 15:54:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-10 15:54:16 +0000
commitb73ced79ece78ec6c20cb53065ea7c4513dc78f5 (patch)
tree567ef8e86cfd09717fe675b9d445d5cbe24dfb90 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent12c8c244a63113612c69d4970878e6722efdaab8 (diff)
parent6e298f6477151f945bf06217b6bbd0998392f3c5 (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
Change-Id: I8e00dfcdb01121674b49d45ddf492b570b3cfc05
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions