diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:56:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:56:24 +0000 |
| commit | bc2a0a3bb4fd2b8da4dc87b6f23e3564a395cb47 (patch) | |
| tree | 03ae597801417f384bb21c8e3810f018d3a9d2e4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 680fc8bcd85b9c85f7e1b5f993b0db3a611e1ec8 (diff) | |
| parent | 9ab6759e68a8ad0ce164aca451259ecffbe42349 (diff) | |
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours am: 2ad9d38a63 am: 135004114a -s ours" into rvc-dev am: a42c621ce8 am: 9ab6759e68
Change-Id: I6bad98cff8f544118fda9f6f4503948f0732a641
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions