commit | 5163fd7aea26e9fbfe624b932d7ee253314c7fe1 | [log] [tgz] |
---|---|---|
author | Jack Yu <jackcwyu@google.com> | Tue Feb 08 02:59:06 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 08 02:59:06 2022 +0000 |
tree | fa7adedd2358636ea41984e758d10bd1a65cb668 | |
parent | b85416796d7893648d785121cf76e99e782ab40d [diff] | |
parent | 7093dea7f7f8d9003d837fc37c53a904e22387d8 [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 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: Ie7899cd8137c524e3fd39a0b50016fbae5d37120