[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: 898f1624c5 -s ours am: b96caa0950 -s ours

Browse Source

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: Iec4f10258415b4ecf9d9d82301dcc8d7b47717ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Oli Lan

2022-08-19 16:15:39 +00:00

committed by Automerger Merge Worker

parent 6b25a211c6 b96caa0950

commit 28c0f0ebba

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available