diff options
| author | 2024-12-14 16:25:36 -0800 | |
|---|---|---|
| committer | 2024-12-14 16:25:36 -0800 | |
| commit | 2bc5865aeb49b56ae067fc7950ab2c6c1c2832fa (patch) | |
| tree | 2511ff8dee4c5ef27b206805a57d72d0dfe7dc22 /tools/aapt2/ResourceParser.cpp | |
| parent | 51bfb7acb7eb694f540071cee85fafdb41a13374 (diff) | |
| parent | a13c7092db0993dc1e0bc2279503b0efce928324 (diff) | |
[automerger skipped] Fix a mismerge by removing duplicated flag for improved wallet role icon am: a13c7092db -s ours
am skip reason: Merged-In I5f91668aca93fcba963e046b7f26345f40a0c6f3 with SHA-1 b43c587e40 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3412029
Change-Id: I43f982b928f0aa00dcf4c097ad24e6a874d0ce27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions