| commit | b41a74c1a980f424114a2b7c4f9df213d06787cb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 18:26:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 18:26:08 2022 +0000 |
| tree | 9e2bd6b1aecd40a4971b19147fb2a12da613d63b | |
| parent | 95ff0f14532ef5984e53cdb4d4040655de3869b2 [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: I6b0a4bc63732cb838bac6d6d16625ca44f6ba4bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>