tree 560f8292c45d5461b87c9c462cf85628b66a8af7
parent 7a14d95270c4824762c4d4be0d99f5a391e6b82d
parent 7902138f2e36ebe7452437a8394619619b8a66a6
author Marco Nelissen <marcone@google.com> 1487022393 +0000
committer android-build-merger <android-build-merger@google.com> 1487022393 +0000

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

Change-Id: I2d9be870193a986d9cd21d7527c4069cd1f184ed