diff options
| author | 2022-08-19 16:12:09 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:12:09 +0000 | |
| commit | 14c006f3530cfd10c8517f133774b21760a3db6c (patch) | |
| tree | 39eadc0d1cde37df02f64d40dcb06caba95c3a30 /libs/androidfw/StringPool.cpp | |
| parent | e73edf2ef1b74fa652cfad307756b3ed8660649b (diff) | |
| parent | 11b8a6fb7fb257d6a7afe9a71eaa1cb0e8fd2b36 (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: 11b8a6fb7f -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: I55a6a6f45bed9e50e24bbeac31d11694de93e974
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