diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:34:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-05 21:34:05 +0000 |
| commit | a42c621ce882db5efbe7421bd8b6bc7ad3610818 (patch) | |
| tree | 2f6194e59424e5ab6f4504c8ca0f389119a11622 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f8c791dc5fff8aa729f082f39fee1c15b561e49b (diff) | |
| parent | 26a812e603da572302a64f17752cf9bf649fc7d8 (diff) | |
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours am: 2ad9d38a63 am: 135004114a -s ours" into rvc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions