| commit | 48046cf4ae6e49afac59730a62900e8e7922c833 | [log] [tgz] |
|---|---|---|
| author | Oli Lan <olilan@google.com> | Mon Aug 22 15:39:22 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 15:39:22 2022 +0000 |
| tree | 4838e7e0350c30fe21071a0fa6009c822d41ee31 | |
| parent | 32e60479ca510929d3aebeb88185a5de77e41c69 [diff] | |
| parent | e2815b7e1147bcdefef8c0529027e33e257e5ab6 [diff] |
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016 Change-Id: I8dbc2b22a606856e839bcdbdc368c139df7d0b30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>