summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-19 14:37:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 14:37:47 +0000
commit4e7416fb178bc7c1d1bd12fba96a8029a0ff0a2f (patch)
treef38ce9f43505d8ed241102528432069d53d554dc /libs/androidfw/StringPool.cpp
parentffda7e441b91d3078b1cdc40d7b6f64c41b000d4 (diff)
parent57b3fe17349c8d914ad5fe10e8b9d43f8b84d461 (diff)
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccfb3 am: a5dfff71ad -s ours am: 57b3fe1734 -s ours
am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19449015 Change-Id: Icfb50ec1245c994a7cfc187ff1057d3c0ed5cdf3 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