tree 62abf36bf6e795ddb70db907e117bcfa708bb021
parent 25e3a403449d355498a7a96ba7e23d57a1e50d3b
parent bc7ecc89b6c1274f8b472a91c50c942924bfd8ec
author Wei Jia <wjia@google.com> 1496858952 +0000
committer android-build-merger <android-build-merger@google.com> 1496858952 +0000

DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am: 8818bf1fbb  -s ours am: b91cfc3589 am: ed429f11e0  -s ours am: 7c86ed20b2
am: bc7ecc89b6

Change-Id: I649fcc18615bca5d29a95da1ec1d2dcca75c2774