| commit | 99fed064c33b5379a24ecce497281f0b7eaa3320 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 19:04:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 19:04:28 2022 +0000 |
| tree | e70d067cab1f09f15669977ec741de1bf4943333 | |
| parent | bb5466b1f8a340663078abc3d78ca0f07bdeb5e8 [diff] | |
| parent | d3fdbf5def263bc5a612355da3a17303d08c3f06 [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: b41a74c1a9 -s ours am: d3fdbf5def -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: If816802fc170e71be42443def8565b27d6b78d28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>