From: Jeff Tinker <jtinker@google.com>
Date: Fri, 21 Aug 2015 16:49:06 +0000 (+0000)
Subject: am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT... 
X-Git-Tag: android-x86-6.0-r1~35^2~2^2~13^2~38
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=186993d738ec3b3c9229f97a5ede86250ff54cfa;p=android-x86%2Fframeworks-av.git

am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhere

* commit '4bbd52382c6eab0b5f2de1ccdfb8da619e40deb7':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere
---

186993d738ec3b3c9229f97a5ede86250ff54cfa