| commit | ed29b05dcdb579905333fb988baef1f69094dada | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 13:10:23 2022 +0000 |
| committer | Oli Lan <olilan@google.com> | Fri Apr 01 16:13:50 2022 +0000 |
| tree | 6df01fd46ca9d8773e4d4986246987c7346cc826 | |
| parent | 14e88ca2f9037f8d8cbe24201c2da114d2d6df3b [diff] | |
| parent | e6e739d8b0f097deb7bd725347d58367f5445264 [diff] |
[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629 Change-Id: I8bba0ed0611a7cef34b210e7e7553de70dbf9aa3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb