tree 77312a379fca2e7414e376b839ded4fac9b2ac9c
parent 46f4ad3a502eac7b29823a0309c39c3cc6eec1df
parent 8265f2b5cccbea6db3f5b84182bf95ee513e4f0b
author Wei Jia <wjia@google.com> 1491612076 +0000
committer android-build-merger <android-build-merger@google.com> 1491612076 +0000

Merge "NuPlayer: notify client of playback error of individual track." into oc-dev am: 1b8ecbb25f
am: 8265f2b5cc

Change-Id: I80cd08c69d0ea2c62165cc216adc5d5cb7c61015