tree 3f60a4924d6c6e3fd1734779c49cfb1f93f771f6
parent 25f5ece09fc045850785f09ddd9193e45b52c9d3
parent eb9f9b7d315292154a029318b1d33e0943ec1334
author Wei Jia <wjia@google.com> 1496859857 +0000
committer android-build-merger <android-build-merger@google.com> 1496859857 +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 am: f7f4d438cb am: 87db87b7bf am: 9088b5b8a9
am: eb9f9b7d31  -s ours

Change-Id: I743d207631e1067459120a7e6e63995d5e2e7654