diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 23:35:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 23:35:41 +0000 |
| commit | e0399661e91222f2f7857d58755351850310c3b9 (patch) | |
| tree | 54571a56570ffbadad8086841994e27d98ffa6d2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 55ae536bcb13f53a3fe75dcd0e0141842ecfae4f (diff) | |
| parent | 442b3d6982a2074c697238d4f18ffed26983d34a (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: 6b1b2f4e51 am: 0a6632effd am: 675100c402 am: 442b3d6982 -s ours
am skip reason: subject contains skip directive
Change-Id: I0113d1b3ea68af43c3358b94364b2f7f1a745c28
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions