summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-07 00:19:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 00:19:50 +0000
commit5c6000d8f14d51358c8df8536872a700fa9803ff (patch)
treebb1a19fdb99dec8a9263edf8d471383f3396edb3 /libs/androidfw/StringPool.cpp
parent20e6d6b0f0102901be4a7da0516718ad552da59d (diff)
parent5212647af4c09a7fdefb779f3ec6c09218a7ba83 (diff)
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496 Change-Id: I6fff0361d9d2da331738202083061655c30aa9a0 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