diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 22:50:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 22:50:19 +0000 |
| commit | 0a6632effd9e2ae0e3e1c571edb067cca0e45c13 (patch) | |
| tree | 57f1f8ce12e2f73574dbce213d563d412342a383 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9e53afddbffce6450ec99826015d4ef6c2d69056 (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: I81fa0d5fa56b6fa37c00a823671767a353ade83d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions