| commit | 819430ed60a95c50b53f8328f6ca203c2f6734d6 | [log] [tgz] |
|---|---|---|
| author | Oli Lan <olilan@google.com> | Mon Aug 22 15:58:26 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 15:58:26 2022 +0000 |
| tree | f0e655182aca2cc3f3d0b9314663b79bb6388547 | |
| parent | 957768ce00d78dc40c9c6156695ab9e8d505a13d [diff] | |
| parent | 48046cf4ae6e49afac59730a62900e8e7922c833 [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: 48046cf4ae -s ours am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016 Change-Id: Iec95e74515918dd7a9c7c0598f88031ee58682d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>