summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-27 22:41:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-27 22:41:39 +0000
commit5b370f2285dc928dab7b39b2befd6bfb1db2f73c (patch)
tree1cfbd5950a9347c34d4212af4fb198231daf86af /libs/androidfw/StringPool.cpp
parent5c1b6d6a55146fd2ee1393cb4498d4571eb796e0 (diff)
parentfa1d300a6f736e743993f89bc537d9816b7f1202 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into qt-dev am: 14a5113c31 am: f36b827848 -s ours am: 4bdc2cd139 -s ours am: 857d4f2a48 -s ours am: 434c64ff6d -s ours am: eee2531e7e -s ours am: c16c4bb875 -s ours am: 2be2258f1f -s ours am: fa1d300a6f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251345 Change-Id: I0c4b4ce8c24b40cfefd64dead45794a43652e7cf 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