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