summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBryan Ferris <bferris@google.com>2020-05-05 21:55:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-05 21:55:32 +0000
commit53d760b7238dd7dbc5e4ab5ee99ef323d9f01754 (patch)
tree03ae597801417f384bb21c8e3810f018d3a9d2e4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent945e9c1db83a335d462f338eaaa533a30279b530 (diff)
parentf9ad3a7e4de9c7f9068c5150c58408d35fbdc717 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into qt-dev am: b60d52fd70 am: e4c1da0634 -s ours am: 9faf53e42a am: f9ad3a7e4d
Change-Id: I9ac9faa213910c171a2afa261d8668b372375904
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions