tree 9d853eb4db9758bf9c1fd9d23df467adb092717f
parent e30d6ec9e8a7680c0c41a19806991f3bbcc045fe
parent 1654a774fced9fff3ac02e4bba6bd786fd5fc090
author Maarten Derks <maarten@fairphone.com> 1633511785 +0200
committer Maarten Derks <maarten@fairphone.com> 1633511785 +0200

Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  Type confusion due to race condition on tag type change

Change-Id: Ib5ab58df7a50ee111106f30554cba19ed4ce642a