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