| commit | cf12118e147c70e0549c14613c8de98e9ef47955 | [log] [tgz] |
|---|---|---|
| author | Karsten Tausche <karsten@fairphone.com> | Fri Mar 19 10:37:23 2021 +0100 |
| committer | Karsten Tausche <karsten@fairphone.com> | Fri Mar 19 10:37:23 2021 +0100 |
| tree | 5c1342a4e53a5301db94314cc0e14bcdc6cd8970 | |
| parent | 697c748a42655dd27fc28e5572f2e3486cffca0e [diff] | |
| parent | b158f9d6c40cb67bfede62a94762d6256bec72f2 [diff] |
Merge the 2021-03-05 SPL branch from AOSP-Partner * security-aosp-pi-release: RESTRICT AUTOMERGE Update String RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message Change-Id: Ia90455c725f93e7328b81ba84bc804e75a074af2