diff options
| author | 2022-08-19 16:12:19 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:12:19 +0000 | |
| commit | c54d6a188fdee89adaf84157d80779cb5da3aa37 (patch) | |
| tree | 04996c4e816ae558d118966b27b47bb43a643069 /libs/androidfw/StringPool.cpp | |
| parent | e6f5cc3a86b89ec4ed1405e390683dae63c4808a (diff) | |
| parent | a66f8efb6ff5fd4364437b21434155c1cfd7a86c (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: a66f8efb6f -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: Iaaa0e9b65b4a0d8f846d7c0adc75c92c8b206115
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