| commit | 7bd23716c3bd71ae2f0d07da8e3dd9ef0cea0992 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 18:03:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 18:03:28 2022 +0000 |
| tree | ecb9c8e71301db8a6f925ed71ed4485a35f5a577 | |
| parent | 4c4a1f58c16d05c96dafae1047b44fe6e6a9a8c0 [diff] | |
| parent | 0b507f020384a6ed7e40f455eb648a98ecdd15ad [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 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: I3f91cd3600b1b581beac0b262a35cbf66fed209e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>