| commit | 8eacc8a8dcd6480d11ec7cd1a85d5fae7b28f1a2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 18:27:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 18:27:04 2022 +0000 |
| tree | 23aeb9130de46e2232ee8865a7192c529785bcda | |
| parent | a30d123e12857c900386ce26227cec7351fa42ca [diff] | |
| parent | 7bd23716c3bd71ae2f0d07da8e3dd9ef0cea0992 [diff] |
[automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383 Change-Id: I8a0e31ec51c4a133b2f4842d47f818461f9e712b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>