diff options
| author | 2022-08-19 17:51:51 +0000 | |
|---|---|---|
| committer | 2022-08-19 17:51:51 +0000 | |
| commit | a229f48ed3c0c8c78a469c59ed9a1362ccda32a4 (patch) | |
| tree | 68b0d5f2e08aa5e33c0e7ad8634f5a2c236abd55 /libs/androidfw/StringPool.cpp | |
| parent | 142c27a0860f06c03b5bc1d1986f1589421a8c7d (diff) | |
| parent | b740fbb058d28184d5c9fc6dd7b663705590b8dc (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: c54d6a188f -s ours am: b740fbb058 -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: If02a4371632dd6d0bf55bf7dca685131755785fd
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