summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-27 18:29:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-27 18:29:50 +0000
commit566f33b86bf7513492a8027ad80b173bc03aa793 (patch)
tree5905e7ad7b20187e4df41e5ec158970a362e979c /libs/androidfw/StringPool.cpp
parent1cbe8b8e7a74a5247d4e90cfbccc5c89968073a4 (diff)
parent9021f45154b2891a4c3d74cc3626136948850b29 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into rvc-qpr-dev am: d833522d43 -s ours am: 82e053bf2a -s ours am: f4ced1f935 -s ours am: 0d6a58c9c8 -s ours am: bcf1f63141 -s ours am: 07b287b205 -s ours am: 9021f45154 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20248332 Change-Id: I29adb2324c6bfc3af504bc2259b0397a14158d1a 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