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