tree 926e4b356aa62340220d368c21e122903d85746a
parent c6f1114a618bf20883c8034444fd91a9546c1fce
parent 6c86d838aa0569410b0e1c0251a589c4d251ea1c
author Maarten Derks <maarten@fairphone.com> 1638961871 +0100
committer Maarten Derks <maarten@fairphone.com> 1638961871 +0100

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

* security-aosp-pi-release:
  Use after free in phTmlNfc_TmlThread

Change-Id: I2b3116ee0577fd355f921f7a65fe2e977ee31878