summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-11 19:46:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-11 19:46:20 +0000
commitf9a612d8e2dfa287306fd695584e2c7c3df964d6 (patch)
treee8b1e837e6171b88b11ace95e6470220e6d7ae98 /libs/androidfw/StringPool.cpp
parentbc7296257ed2b0f8c7a5f774db8ec361a89e295d (diff)
parentccf92b97a39878383ba9b68fa18fc6b32788dbf5 (diff)
[automerger skipped] Merge "[SettingsProvider] do not crash the system if config settings files are broken" into udc-qpr-dev am: fb224c5954 am: ccf92b97a3 -s ours
am skip reason: Merged-In I9851991b4a225f2941708d37d2ad9507d7c432f8 with SHA-1 2ba72c0611 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24682390 Change-Id: Ia3ced0b26f126db0c663c151f79175ed48e83752 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