| commit | e3083b5ea9858c6a2925d1d9446c82fa2ad61365 | [log] [tgz] |
|---|---|---|
| author | Maarten Derks <maarten@fairphone.com> | Tue Mar 29 14:04:09 2022 +0200 |
| committer | Maarten Derks <maarten@fairphone.com> | Tue Mar 29 14:04:09 2022 +0200 |
| tree | 6d58afaeead9023490fd3a009659aa462ae69f2d | |
| parent | cf38b6e8a1747c073dc2d9b9d3ddcc1349749b95 [diff] | |
| parent | 20642f2f97f923f5359447f66665d541946a2c4b [diff] |
Merge branch 'security-aosp-qt-release' into int/10/fp2 * security-aosp-qt-release: Do not let guest user disable secure nfc Change-Id: I38757bb45e2bcdea679ec531a73872211831388d