summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Ben Murdoch <benm@google.com> 2024-09-09 13:17:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-09 13:17:28 +0000
commitca6185ae82f427d356685cd1c9ed037ab7f1d2c5 (patch)
treebd5d81445999d371b7377ccbc9cf5491f21d516c /libs/androidfw/StringPool.cpp
parent006be46cc68e5000cdf9e4d843c405e06ff357c7 (diff)
parent021278f83a109279708b7c4a7b4b6aeeedd56c51 (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: 021278f83a -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29024181 Change-Id: I2009fc240783d6563d824983e740f849adc0d3a7 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