diff options
| author | 2024-09-11 18:50:48 +0000 | |
|---|---|---|
| committer | 2024-09-11 18:50:48 +0000 | |
| commit | 160e0a2652cba05f50d6f3cd4c56c2bde708c0d3 (patch) | |
| tree | 26795c823194532eee20185a49c0281d7d66567e /libs/androidfw/StringPool.cpp | |
| parent | 40ec306462dd8f2a3d182635303883f885df04ed (diff) | |
| parent | aa046584aa94ba5a1ce9807531ec6f59d7b70469 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into tm-dev am: 43dc334dcf am: 3f0fc1f2b6 -s ours am: ff85060e4a -s ours am: aa046584aa -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29073445
Change-Id: Ia813c22155dd3513d79c43ae0b0f84ac88ce9754
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