summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBryan Ferris <bferris@google.com>2020-05-05 21:55:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-05 21:55:46 +0000
commit8840fbfe0f601720041155afe062b7b2139dea1b (patch)
tree03ae597801417f384bb21c8e3810f018d3a9d2e4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent53d760b7238dd7dbc5e4ab5ee99ef323d9f01754 (diff)
parentf559e859649c5e4dc5a5c74dcdd6ebf3760f6b12 (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 am: f559e85964
Change-Id: I88c04b0286a15bc6c7a30957459f44d785fe9acb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions