am cee546e5: (-s ours) am bcf3a11f: am e5d4a0be: DO NOT MERGE Part of fix for libmedia OOB write anywhere
* commit 'cee546e501a3e2c0591f259bb25a114130d58eb0': DO NOT MERGE Part of fix for libmedia OOB write anywhere
This commit is contained in: