diff options
| author | 2022-08-19 16:29:41 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:29:41 +0000 | |
| commit | df8fff19a6171564c2e5b823815fc3ba9a2d5425 (patch) | |
| tree | b024897ff29ccf56bec96cd75557bf33a2e3d0b6 /libs/androidfw/StringPool.cpp | |
| parent | 28c0f0ebbaa53eaaf5f28c134adab7b680b14a0c (diff) | |
| parent | e6f5cc3a86b89ec4ed1405e390683dae63c4808a (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 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: I011cf1b0f7e6fe4439f202f942448100a37fd3ad
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