| commit | 40ec6382a032fc6eafa7bc6f333fda626850f62a | [log] [tgz] |
|---|---|---|
| author | Oli Lan <olilan@google.com> | Mon Aug 22 16:16:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 16:16:49 2022 +0000 |
| tree | 899747e35f01f1fb42a18fd1a33c40c5a9fcced0 | |
| parent | 1d2a59d59c0e028ec55bc6d85dedd87e2ae2e9de [diff] | |
| parent | 141dc63796807be22e8c0c5e67cae474156b7d88 [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: 141dc63796 -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: I4db81a26ef2ede09401e576c6fc5afeb57d48291 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>