diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:43:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:43:24 +0000 |
| commit | 9d70ac02dc11cc63a6ed6908ee413457c3dd77af (patch) | |
| tree | d804b3ca3586a76d086fa06a2b4150ddeec8f80b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c51ceb75e0ed8f59b1ca63ce03204658dec829d8 (diff) | |
| parent | a42c621ce882db5efbe7421bd8b6bc7ad3610818 (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 am: a42c621ce8
Change-Id: I717a0ac2492d4196805c156b6163538fb1a4b0a7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions