diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 21:33:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:33:07 +0000 |
| commit | 9faf53e42aa8382577529a0b501af75d36db4e72 (patch) | |
| tree | 2f6194e59424e5ab6f4504c8ca0f389119a11622 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a8cb1caf9fbd04b0a7493d8b7a0405c7ec3ba910 (diff) | |
| parent | e4c1da0634af0dd3bc63db666702e45e0ea056fa (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into qt-dev am: b60d52fd70 am: e4c1da0634 -s ours
am skip reason: subject contains skip directive
Change-Id: I00a0cab8cbf9e58d4d8fd86bc37232c69e813254
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions