am 6a7d526d: 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 '6a7d526def295ed39d58562ca02a46c4801b8eed':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in:
Jeff Tinker
2015-08-22 00:41:21 +00:00
committed by Android Git Automerger

Diff Content Not Available