diff options
| author | Bryan Ferris <bferris@google.com> | 2020-05-05 21:56:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:56:22 +0000 |
| commit | 680fc8bcd85b9c85f7e1b5f993b0db3a611e1ec8 (patch) | |
| tree | 03ae597801417f384bb21c8e3810f018d3a9d2e4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8840fbfe0f601720041155afe062b7b2139dea1b (diff) | |
| parent | 3798d52cd6435e270f1bfaf946620e4940088305 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours am: 2ad9d38a63 am: 135004114a -s ours am: 26a812e603 am: 3798d52cd6
Change-Id: I7b25dfdc6f586de5127bf77399890eff6ee33fe2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions