summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-19 16:15:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 16:15:20 +0000
commit6b25a211c69d49e7298f99da81f8651439027dfc (patch)
treeb024897ff29ccf56bec96cd75557bf33a2e3d0b6
parentb61ef2b0fb8100bc39f15632d4fb79daa4df2d3a (diff)
parent14c006f3530cfd10c8517f133774b21760a3db6c (diff)
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev am: 53738ccfb3 am: a5dfff71ad -s ours am: 57b3fe1734 -s ours am: 11b8a6fb7f -s ours am: 14c006f353 -s ours
am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19449015 Change-Id: Ib22af94edcff56b64abf4c3a0615ff99fd114e51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions