tree 298578f4966f66e25d4893a6a7c600460669caec
parent a6b1816e163ef1cf9deb2a605a7800c8e0b8edf9
parent f8a2e81bc460a33e4198cc5146ac76c9b970c0a4
author Marco Nelissen <marcone@google.com> 1487022691 +0000
committer android-build-merger <android-build-merger@google.com> 1487022691 +0000

Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e am: a23c9a47ab
am: f8a2e81bc4

Change-Id: I64518f5a3860f66d3e232589f8c9ef643e572053