summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-08 01:19:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-08 01:19:37 +0000
commit50214468d2211a190ac53ee467aad06b519f9f1e (patch)
tree9c44048d10aa10de3c2184170320a6720870d68e /libs/androidfw/StringPool.cpp
parentbb43bb7c08bb91ebafbb7225012ad39603c97f35 (diff)
parent1eb9a20cfadc35d73a72dfa916fc7cb08fa346ec (diff)
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into qt-dev am: 380ec03dee am: e5fdd7f0de -s ours am: ae6b8569a3 -s ours am: 36de09dab8 -s ours am: 6f0bda9117 -s ours am: 98bd7eb129 -s ours am: c8f0bfea4e -s ours am: 66b29d5dbb -s ours am: 1eb9a20cfa -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 1fcd99f5aa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816794 Change-Id: I66c4c1a8cdfa29ec89360d7b759807c7e85d7403 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