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