commit | 387566c7d36bb92bc82aca33df6ef204d58d2862 | [log] [tgz] |
---|---|---|
author | Jack Yu <jackcwyu@google.com> | Tue Feb 08 04:06:31 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 08 04:06:31 2022 +0000 |
tree | 8b3e092bb0f547291070209b6217af9a60682aa9 | |
parent | cc53a54f0a60eee3faf7db355ce320e026dc1128 [diff] | |
parent | 658476219d925d69264743c14785f53dd75822db [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: 3e076f98b5 -s ours am: 658476219d -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: I4d8cefbc0952cae4282f5ff6586a28255aa0b8d1