diff options
| author | 2025-01-16 11:58:03 -0800 | |
|---|---|---|
| committer | 2025-01-16 11:58:03 -0800 | |
| commit | 7718effb80f587a3a46ef3a634adff524d4e83df (patch) | |
| tree | a399a712e2d5b5d6b204e5b52174bb8826c83d93 /libs/androidfw/StringPool.cpp | |
| parent | ed1374d83e14483724c1522dfb170369e8327db3 (diff) | |
| parent | 49aec9e66ab616c1f402c85298d7328e0d8bec22 (diff) | |
[automerger skipped] [conflict] Merge "Verify that the caller has permissions for the icons it provided." into tm-dev am: c16a34e172 am: 5a866ff09f am: 49aec9e66a -s ours
am skip reason: Merged-In I08992550507572a4878c501184360a58adef53ad with SHA-1 bad47a2280 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31165238
Change-Id: I6f05f312245a5c60f927666ad4f1d57081a50d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions