| commit | 9f87ce1cbd4ec21173dd50fe21952ce53dc53d24 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 19:33:54 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 19:33:54 2022 +0000 |
| tree | e70d067cab1f09f15669977ec741de1bf4943333 | |
| parent | 99fed064c33b5379a24ecce497281f0b7eaa3320 [diff] | |
| parent | cf96e65a6f0b16e28969ccfc64bb25823e703df1 [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: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours am: cf96e65a6f -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: I5c2b69ec2c780d5059ca2777909d439b71fb61e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>