diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 21:48:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:48:11 +0000 |
| commit | 2adaef294b383e3b8edf855d973ab0be8b35d7db (patch) | |
| tree | 9fcd608ebb46b49b9d63b3b366708030802dabbf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a6ccecb6a7ff751e6a313004ea4e9bf35efc8515 (diff) | |
| parent | b1ae5fd44388f4e3c74a8caa690d4a66e9f99f4d (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into oc-dev am: 6255311d39 am: e18fd339be am: b1ae5fd443 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifcfb341328552ff00f058df8ae3eb5734f87b4af
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions