diff options
author | Bryan Ferris <bferris@google.com> | 2020-05-05 21:04:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 21:04:43 +0000 |
commit | 2ad9d38a6371068aaf41433396183773221a66bd (patch) | |
tree | c474b38b0c52661399ff97de5d5d6edef7ccb9f4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b60d52fd7089248045111b434b30d6a107ae22ec (diff) | |
parent | 7a77f798b6dbf0886ed2cfaca82b087ee409bb9c (diff) |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours
am skip reason: subject contains skip directive
Change-Id: I24fc0b3340434dc5ad36787759d505420816aecd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions