tree 8179330e311b040a323c67b74cd16253a68bfa89
parent f43c09e520e9bb3a116ea50fc17a0fa570c26b97
parent 2a75ff3ab4d7074d05059f2ad2a569ff67dc2411
author Marco Nelissen <marcone@google.com> 1564704776 -0700
committer android-build-merger <android-build-merger@google.com> 1564704776 -0700

Merge "[automerger] Fix OOB access in mpeg4/h263 decoder am: ef4ce15700 am: 9832a2a3f4 am: 144ba69187 am: 6fa588c7b6 am: 88c0c4897c am: efd8f9e09a am: e545f3c8d3 am: 6cf42dbae7 am: 874ec86ebc am: ddf94140d7 am: 7e7c399e56" into qt-r1-dev-plus-aosp
am: 2a75ff3ab4

Change-Id: I2dd08d004f4b7195c9f60a018fcfa1492543910f