am af90b037: am 1827f14b: am c1447241: (-s ours) am 693f0813: am 87922237: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit 'af90b037a4baa6e12ee2399c85c7e3d4b592498e': DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in: