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