tree 7ee83b33b339350e90c9030176d87f80babfeb63
parent e822d32a850df1368144ee0be1636dc5ca5a892d
parent c448c4980afd0b6d3d9dbb08ab25dd0459a0fe37
author Maarten Derks <maarten@fairphone.com> 1638961875 +0100
committer Maarten Derks <maarten@fairphone.com> 1638961875 +0100

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

* security-aosp-pi-release:
  SimpleDecodingSource:Prevent OOB write in heap mem
  Fix heap-buffer-overflow in MPEG4Extractor

Change-Id: Id610a2db4fb24b4eeecd2869307f81117c0699ce