diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 22:27:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 22:27:49 +0000 |
| commit | 6b1b2f4e51f6c276b2c61043334b4271bb20dd0b (patch) | |
| tree | 2f6194e59424e5ab6f4504c8ca0f389119a11622 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 715254a18c6603298c28124bbe18faaec8b0e9cd (diff) | |
| parent | 306b8b41925258d3a38269888c1164a8beb82010 (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: e5f0ec9b2a am: 306b8b4192 -s ours
am skip reason: subject contains skip directive
Change-Id: I483ae77857aea06ea85b0f8a8e1b8c8b16638129
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions