diff options
| author | Amy Zhang <amyjojo@google.com> | 2021-01-20 23:27:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 23:27:00 +0000 |
| commit | bcfa492ee7957bf20321b197dfa67284a58ab863 (patch) | |
| tree | deb1015d336b41a7c75d880e083cb090faa0ae2c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 758c0c54bf5115e1a9f3b77c2c07d14bbf75ff53 (diff) | |
| parent | ff5d180dd6f988ad70b806bf04a10f1a5461d610 (diff) | |
[automerger skipped] Merge "Only allow RecordDVR to flush buffer when the DVR is stopped" am: 30e3efaaa5 am: 6c28ea88e5 am: ff5d180dd6 -s ours
am skip reason: Change-Id I5fa31c34cac83bb5952576adf86c5a31ec62d9b5 with SHA-1 0317f6db48 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c91a4bf43048e0282dc119697ebc75ba23c0ea0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions