summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOli Lan <olilan@google.com>2022-08-22 16:33:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-22 16:33:56 +0000
commit6df04850b85120d6009ba2705adaf6faa24c6727 (patch)
tree28d500863dfaaba137c131fdd9bccf3f1930d43f
parent03a566adc5ef89d599072721e8c902e2a95c767b (diff)
parentbb562d7426e116e26ad95886fc37f8c808af57f6 (diff)
downloadSettings-6df04850b85120d6009ba2705adaf6faa24c6727.tar.gz
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016 Change-Id: I24aa3331a0019cbc78690072f04468cd66b3d494 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions