diff options
| author | 2022-08-19 16:12:10 +0000 | |
|---|---|---|
| committer | 2022-08-19 16:12:10 +0000 | |
| commit | e6f5cc3a86b89ec4ed1405e390683dae63c4808a (patch) | |
| tree | 04996c4e816ae558d118966b27b47bb43a643069 /libs/androidfw/StringPool.cpp | |
| parent | 1378c0d23a8efb41c1e409281af95c2975d387d1 (diff) | |
| parent | 4e7416fb178bc7c1d1bd12fba96a8029a0ff0a2f (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 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: I68265e091c9be2a49247c6c55abe2f5fc8676bbf
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