summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-19 16:12:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 16:12:18 +0000
commitb96caa095031f84956fbcd15337a117f2a96c83d (patch)
tree39eadc0d1cde37df02f64d40dcb06caba95c3a30 /libs/androidfw/StringPool.cpp
parent14c006f3530cfd10c8517f133774b21760a3db6c (diff)
parent898f1624c50ecf986cf1e9cce914f322c76d91b9 (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: 898f1624c5 -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: I1c71f6791f20ddf179e60e6a624248b290ee9ba3 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