tree a8d8cf072961ac8be8492f0ef370a24f068c9f6d
parent bb3d5445c98bc4ea8e7da8e84a2ac94031460faf
parent 3b1a9c3f1bfbfafbfc754e2929b3f0874ac53f49
author Wei Jia <wjia@google.com> 1496777644 +0000
committer android-build-merger <android-build-merger@google.com> 1496777644 +0000

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

Change-Id: I2345da7f0816430a7a3eb1e42e411a41c4487a98