| commit | 0b507f020384a6ed7e40f455eb648a98ecdd15ad | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 01 17:48:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 17:48:29 2022 +0000 |
| tree | 30c47dbc9dc01df7aa863a4a43f8907f8ae58baa | |
| parent | 652527b4960add88f7ba08713c9432f1991abda8 [diff] | |
| parent | ed29b05dcdb579905333fb988baef1f69094dada [diff] |
[conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383 Change-Id: I03622a4803112de1f7b2f2fb3000b007444bc19b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>