| commit | 3e076f98b5f60e16c0473907ae41f28365a30e17 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Tue Feb 08 03:31:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 08 03:31:02 2022 +0000 |
| tree | 7b49335aed6e94eddb34a70cf00839e5d3b2878b | |
| parent | ea2313ee1caf4b6c08d701a2aa69ebb3fd1d76ff [diff] | |
| parent | b3762ca5f416e2cc49d0b5b45412dde3b68061b0 [diff] |
[automerger skipped] Do not let guest user disable secure nfc am: 4e543a38f6 am: 46bd9ba5a5 -s ours am: cd6ce52ea4 -s ours am: 7093dea7f7 -s ours am: 5163fd7aea -s ours am: b3762ca5f4 -s ours am skip reason: Merged-In I7253f7f08fde04e30400a30d9a0d24f1ceff04b0 with SHA-1 a579ca7554 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16691813 Change-Id: I3c907ca25472d4bd87a09599d67aac7f480ef71c