tree 7a8a723538b6f1be37ba970c5d191d51cc2ce19c
parent 8c23ff56753e0a476e0ecb041d0967cb7cb38d4a
parent 36beac5fc2024d439b23ade18624cb868663c29b
author Maarten Derks <maarten@fairphone.com> 1668593250 +0100
committer Maarten Derks <maarten@fairphone.com> 1668593250 +0100

Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  RESTRICT AUTOMERGE - [Fix vulnerability] setSecurityLevel in clearkey

Change-Id: Icb359217f0d53e6ccc82f9ff150a860f4f231ba5