summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-19 14:39:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 14:39:15 +0000
commit11b8a6fb7fb257d6a7afe9a71eaa1cb0e8fd2b36 (patch)
tree7536401901e7ffe2ede88a4ae49d48464a22fc6e /libs/androidfw/StringPool.cpp
parentbc225079014a4eabbb9aad9d9b9cea7a8c9a2040 (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: Ic827bef5f1ceb9b069270ccdec938a7606dfc04a 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