diff options
| author | Xin Li <delphij@google.com> | 2021-03-04 00:12:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-04 00:12:15 +0000 |
| commit | 542c1fecf5677b677dd1727b1f07cc9f3343cf93 (patch) | |
| tree | 4f700b78149c59039f8155c6b9cee5e70784306b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6c1dca2e25679f326a7af5e8a79f2acb2ab03c49 (diff) | |
| parent | 49ceda904aca3826c11a951fc8c894688ba307c3 (diff) | |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e98 -s ours am: 065dbb1c6b -s ours am: 49ceda904a -s ours
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I988e8a4b397af4360da97e97c79307ba62b155f6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions