| commit | 20dacec65b3591a87c8c33f707f448d37dc74abb | [log] [tgz] |
|---|---|---|
| author | Oli Lan <olilan@google.com> | Mon Aug 22 16:53:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 22 16:53:09 2022 +0000 |
| tree | 4bb69d85dd5efe99e4893da62b93794251b41f79 | |
| parent | 9190be82887d1ded9ba7703fc68dc2c793308ce8 [diff] | |
| parent | 80cdde7ce8176a5629ab557c9687daea85449a1b [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: bb562d7426 -s ours am: 80cdde7ce8 -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: Idac34b4a807a9cda12ad28cfa38a9a195cec12c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>