| commit | 6d9631779ddf65eb93b736deeec60acbc3391c8f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 18:41:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 18:41:57 2022 +0000 |
| tree | 284eaa559f65edd4f11994ce5bcce25af0f22d62 | |
| parent | baf2ef0be690dc03e12b4f4bdc7d95dd2b5f034b [diff] | |
| parent | 8eacc8a8dcd6480d11ec7cd1a85d5fae7b28f1a2 [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 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: I19f3ca5069da1b3bcce1e50583b06f5f6e0d2fa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>