commit | bb562d7426e116e26ad95886fc37f8c808af57f6 | [log] [tgz] |
---|---|---|
author | Oli Lan <olilan@google.com> | Mon Aug 22 16:33:17 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 16:33:17 2022 +0000 |
tree | 11f6429856a568a8732e661a3cb0073af452182d | |
parent | d3938dfc4c32fd55797aff647c5e1be0daaaff33 [diff] | |
parent | 40ec6382a032fc6eafa7bc6f333fda626850f62a [diff] |
[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 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: I07b0906b78784d42784afcc982973e916517b479 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>