summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBryan Ferris <bferris@google.com>2020-05-05 21:43:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-05 21:43:06 +0000
commitfb911103cd197b0cc2d85b47a9b4e5196327623b (patch)
treed804b3ca3586a76d086fa06a2b4150ddeec8f80b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5a6f893b5c8d928e2cb2b0538b02e6824948f09c (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: If9c363ca501d76abc42d4d2a3237e3165d4689be
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions