summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-03-06 15:24:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-06 15:24:36 +0000
commit7f180751404437f2380fc7735b84a136ea976969 (patch)
treee6a5bd72223f256ba2cb72c076f5f5ef2368bb3d /libs/androidfw/StringPool.cpp
parentd1780ebee0e14e8c0c66acbf343fdaf488f1afd8 (diff)
parent3f71147ec183ac32a642fe8ebf6384dd8948b7a9 (diff)
[automerger skipped] Merge "Limit the number of shortcuts per app that can be retained by system" into sc-dev am: d8bf6af4fc am: 2e79de04d1 am: 3f71147ec1 -s ours
am skip reason: Merged-In I001c7a87b62aefa9487bf8efaf3cd02d7cb21521 with SHA-1 be9d9c04db is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21574889 Change-Id: Ib3e2a10834a470666cb7ca42cd2a1aa8e3da9217 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