| commit | 658476219d925d69264743c14785f53dd75822db | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackcwyu@google.com> | Tue Feb 08 03:48:08 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 08 03:48:08 2022 +0000 |
| tree | f29cf532cd5b41a404b77bb81687ecadc80fbb92 | |
| parent | 00682396b3d708c48d48d269fc5f46c9d24ed33f [diff] | |
| parent | 3e076f98b5f60e16c0473907ae41f28365a30e17 [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 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: I0e64f8d20e1849696f759b1a19feb7f6eae6ddfc