| commit | 00682396b3d708c48d48d269fc5f46c9d24ed33f | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Tue Feb 08 03:47:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 08 03:47:55 2022 +0000 |
| tree | f29cf532cd5b41a404b77bb81687ecadc80fbb92 | |
| parent | b97acda5cf63725f1e507aeb82460a1113e2cba6 [diff] | |
| parent | 1b4a91414ec619c1395e826d5b2ccafa1a6461be [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: 1b4a91414e -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: I2ca009158991817d9bb19fe59a9be319bbb97505