diff options
| author | 2025-01-08 15:26:21 -0800 | |
|---|---|---|
| committer | 2025-01-08 15:53:27 -0800 | |
| commit | 49aec9e66ab616c1f402c85298d7328e0d8bec22 (patch) | |
| tree | 44917b30b38c0666c0aaffb5a5672bc0e5cb687a /libs/androidfw/StringPool.cpp | |
| parent | 95ec69e06e8d8747281ed1871b7b3a5165626e54 (diff) | |
| parent | 5a866ff09fae83084b2b585b06f6a2848f04000f (diff) | |
[conflict] Merge "Verify that the caller has permissions for the icons it provided." into tm-dev am: c16a34e172 am: 5a866ff09f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30811127
Merged-In: I08992550507572a4878c501184360a58adef53ad
Change-Id: I4f8db231ec63aefd93e34ebeceddb1b4002c5387
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