commit | b3762ca5f416e2cc49d0b5b45412dde3b68061b0 | [log] [tgz] |
---|---|---|
author | Jack Yu <jackcwyu@google.com> | Tue Feb 08 03:12:04 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 08 03:12:04 2022 +0000 |
tree | a6e93caa79f24156a58f38fcd471d6aec7209d2f | |
parent | e7f361b3cc98b453ae9b314a5248e3c5d59f0e82 [diff] | |
parent | 5163fd7aea26e9fbfe624b932d7ee253314c7fe1 [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 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: I8654c830eaebe72d6f84f8966c43ea74979b14af