diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 22:50:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 22:50:46 +0000 |
| commit | 253bd94bd40f5c556298aad918e27072abf17a2e (patch) | |
| tree | d804b3ca3586a76d086fa06a2b4150ddeec8f80b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bb4b449fe8d6a22c98acb9dc225589146087ee7f (diff) | |
| parent | 6b1b2f4e51f6c276b2c61043334b4271bb20dd0b (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
Change-Id: I89f666ad2d607749f8161f25f3ad50696aa1fe02
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions