summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBryan Ferris <bferris@google.com>2020-05-05 21:42:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-05 21:42:45 +0000
commitf559e859649c5e4dc5a5c74dcdd6ebf3760f6b12 (patch)
tree57f1f8ce12e2f73574dbce213d563d412342a383 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf9ad3a7e4de9c7f9068c5150c58408d35fbdc717 (diff)
parentf8c791dc5fff8aa729f082f39fee1c15b561e49b (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours am: 2ad9d38a63 am: 135004114a -s ours am: f8c791dc5f
Change-Id: I71e5ebcc7ef93357cf1d57e411514b90533a9f16
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions