diff options
| author | 2024-09-09 13:07:02 +0000 | |
|---|---|---|
| committer | 2024-09-09 13:07:02 +0000 | |
| commit | 021278f83a109279708b7c4a7b4b6aeeedd56c51 (patch) | |
| tree | 29a496e531916869dbb9ebbc00269ca932331375 /libs/androidfw/StringPool.cpp | |
| parent | cb5e1e2ca181f5a6a8d793eef9dd681382ad8c40 (diff) | |
| parent | 289786cdf9421b53bde42bf09f09cc9e2d667258 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Clear app-provided shortcut icons" into sc-dev am: 40656631c5 am: 3be0af36be -s ours am: 9e1c27f1d2 -s ours am: 289786cdf9 -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181
Change-Id: I5c026d119e1c18acdacadcddb6a8cc0e275b0518
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