tree f1ba03d7e04d6fef1414dba03b5ac879432a84e0
parent 7ba758430328da0c9f6248d82732f5d42b12c8f4
parent b95bbe95b5e55ab428ee0154e0bddda4146d41d3
author Wei Jia <wjia@google.com> 1496859216 +0000
committer android-build-merger <android-build-merger@google.com> 1496859216 +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

Change-Id: I72cbcb93e255b161e03107d75539987c9df4e4d4