diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 23:23:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 23:23:52 +0000 |
| commit | 442b3d6982a2074c697238d4f18ffed26983d34a (patch) | |
| tree | cb5d8611ddb7ce45fdab78b7f2a1855669d9ae7a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f57fd6093663fd9a89990a3ed26c1924d158fe0b (diff) | |
| parent | 675100c402f804bea59e588521e123cf1a55ccd8 (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
Change-Id: I1eb847a13303f43167341946690af956c5f5581d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions