| commit | 668157332e91d3870d7acc89ac4b1d48a2af4796 | [log] [tgz] |
|---|---|---|
| author | Maarten Derks <maarten@fairphone.com> | Fri Aug 06 11:39:39 2021 +0200 |
| committer | Maarten Derks <maarten@fairphone.com> | Fri Aug 06 11:39:39 2021 +0200 |
| tree | 87354534dd2103775c4c58c6a88c3fed2982159c | |
| parent | d1da52f8f76014b969b2f7b3981a5cd8b2f5b955 [diff] | |
| parent | 2b1eb8774a0172d193d5d090923599e5851ec34c [diff] |
Merge the 2021-09-05 SPL branch from AOSP-Partner * security-aosp-pi-release: RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message RESTRICT AUTOMERGE Update string Change-Id: I6ee2382847be29cafe77be4777b373c614a02144