| commit | afe98deb64c618f93268110e0d8070ee268c22b1 | [log] [tgz] |
|---|---|---|
| author | Maarten Derks <maarten@fairphone.com> | Wed Jan 12 13:20:50 2022 +0100 |
| committer | Maarten Derks <maarten@fairphone.com> | Wed Jan 12 13:20:50 2022 +0100 |
| tree | a63a1df416567378467eefef3553511a71a27866 | |
| parent | 63229e2aad088ac00cf567e3c1d6dcad0a8edee5 [diff] | |
| parent | a0456b7797c13516a212e2bcf612193a3099e39c [diff] |
Merge branch 'security-aosp-qt-release' into int/10/fp2 * security-aosp-qt-release: RESTRICT AUTOMERGE Remove line of code that was mistakently left in. Change-Id: I30fd99aa5c71d5d3ed9238f78c7067b24966a06f