summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Pinyao Ting <pinyaoting@google.com> 2023-03-07 16:09:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-07 16:09:13 +0000
commit71f840269a7c534304e46175b66334ab80abdf91 (patch)
tree03277a0c0a87cbb1634cd8f00e77c1ebe81a12d0 /libs/androidfw/StringPool.cpp
parent20948342359f77d45f1b623a609672e42dde172b (diff)
parentd17ac1a93265dcc036c088dbe64f225e856e22d0 (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: 7f18075140 -s ours am: d17ac1a932 -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: I1070b285120bacdd490f3f5dc9a326de90c8641b 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