diff options
author | Henry Fang <quxiangfang@google.com> | 2021-01-15 19:46:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 19:46:30 +0000 |
commit | 7c0de1b4765d15946a53f620b8c5429728cbf3d0 (patch) | |
tree | 7f2ef5298b426bf5a1e16e4260bbfde8f0b5e709 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3becaf0ebccdbecc0058c324a502aac8ea3f6576 (diff) | |
parent | b4cd332de492649170de45073a66d736a48f6fa2 (diff) |
[automerger skipped] Merge "Add pause and resume recoding APIs" am: abf0168d4a am: 094ad6ee90 am: b4cd332de4 -s ours
am skip reason: Change-Id Ib11ae5d3eddcd01dbd48efa58fb2d4011040b210 with SHA-1 d22f674de8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cd49885197d725b3269dcd46812b3ca3ca86f86
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions