commit | 9190be82887d1ded9ba7703fc68dc2c793308ce8 | [log] [tgz] |
---|---|---|
author | Oli Lan <olilan@google.com> | Mon Aug 22 16:52:51 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 16:52:51 2022 +0000 |
tree | 4bb69d85dd5efe99e4893da62b93794251b41f79 | |
parent | c77ab557351f40d42cc90baa353837316232c857 [diff] | |
parent | da927d5a6bdc8d05f69bb3d6e78cf57e419190dd [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: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -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: Ibfa43da3f5eb0d54d820615acaba4c10727aa59f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>