tree a025a5f5ee576276e443da8b09c1608cd6ac187a
parent 5304cbcee8b441455e9dc8cfa21237acff695f6c
parent 92f7d06bb1641aa49108a3c99ed13b17f8037518
author Wei Jia <wjia@google.com> 1496859402 +0000
committer android-build-merger <android-build-merger@google.com> 1496859402 +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 am: d687ad050e am: b95bbe95b5  -s ours
am: 92f7d06bb1

Change-Id: I53de1bea488aae856123f2a5b8bc231b67a8cfcf