tree ae8c421a8aede10c9c8ab6c9cdde20e088e4a4ea
parent fdd5f801f5aaf06774087b10ca1795c634792410
parent 87db87b7bfad37066d559c9376afc133f75abb91
author Wei Jia <wjia@google.com> 1496859643 +0000
committer android-build-merger <android-build-merger@google.com> 1496859643 +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

Change-Id: I8440941258776b66f8405b6150875743f90dc36d