diff options
| author | 2022-08-19 17:50:53 +0000 | |
|---|---|---|
| committer | 2022-08-19 17:50:53 +0000 | |
| commit | 0a3a32df513850fae93cf0f30ec3d0f8b380837a (patch) | |
| tree | 68b0d5f2e08aa5e33c0e7ad8634f5a2c236abd55 /libs/androidfw/StringPool.cpp | |
| parent | e650b9a1aeb45987aebb33e14d8bf86bd01f5908 (diff) | |
| parent | df8fff19a6171564c2e5b823815fc3ba9a2d5425 (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: 4e7416fb17 -s ours am: e6f5cc3a86 -s ours am: df8fff19a6 -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: I99b17b347e1a60bf172e84ca410542f5c2fb2725
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