tree 529199af40bba16e43c36f632082786d0c69bf82
parent cdc2e0a0d8ca7b061a9a86431bc366a1d864b4fd
parent 9088b5b8a93bfadf23c88ffea894f091801f6109
author Wei Jia <wjia@google.com> 1496859733 +0000
committer android-build-merger <android-build-merger@google.com> 1496859733 +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

Change-Id: I870b2774f21cf227730d6a00b487750d5ba4055a