summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-07 01:54:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 01:54:39 +0000
commit085f84d1f5a5d628bddb3b5fe320f84b1118021f (patch)
tree0a9a50137b02aa5d4ce99e22651672fb2a28ea98 /libs/androidfw/StringPool.cpp
parent17b4862ba751baf44484c0ebdf994bcf0c4ceb06 (diff)
parent89ed3f88fa25869cc9428b11912602657a8cd3f1 (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: f3ad8d4700 -s ours am: dc99ca69f1 -s ours am: 89ed3f88fa -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: Iabce9cac353385147b3fcd86b77cdb6884e02596 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