tree c34aaadfc740e58fe9853f66bf5f80d897c3c35f
parent cfd9b9b85a7af2db0670ab98045558d35d530e16
parent 333b2d578a98941a41e258241b48e1702df376e1
author Wei Jia <wjia@google.com> 1496778701 +0000
committer android-build-merger <android-build-merger@google.com> 1496778701 +0000

Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9 am: 6a2a5b5808
am: 333b2d578a

Change-Id: I33e279617987ea8e577b06ce8666825f0c6f5ca5