diff options
| author | 2021-03-03 23:37:15 +0000 | |
|---|---|---|
| committer | 2021-03-03 23:37:15 +0000 | |
| commit | 49ceda904aca3826c11a951fc8c894688ba307c3 (patch) | |
| tree | 4f80fc6f222cdeb854a49b1eed2f9330f86caaa0 /tools/aapt2/ResourceParser.cpp | |
| parent | 1881ec9386a11993784939e89a1a562850591a1f (diff) | |
| parent | 065dbb1c6bf598583bed45090d6d1cc14a22c3ea (diff) | |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e98 -s ours am: 065dbb1c6b -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: I4f023fd4fe72b6254cf51af02ca8bd5967e49549
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions