diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 21:33:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:33:23 +0000 |
| commit | f8c791dc5fff8aa729f082f39fee1c15b561e49b (patch) | |
| tree | 2f6194e59424e5ab6f4504c8ca0f389119a11622 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9faf53e42aa8382577529a0b501af75d36db4e72 (diff) | |
| parent | 135004114a9af0c2b28cecfbe45f39a547a24141 (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 skip reason: subject contains skip directive
Change-Id: Ia7cbb0973c67e106c4ec152a78966bc1431fe759
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions