tree 94ff644e1144a89b7fdfee932fc0a463ab5b7411
parent bd6081a604fbe905a00a514a0333e3d737ffedc7
parent c486e13446f709b1ba54269d14277e64eef6f32c
author Wei Jia <wjia@google.com> 1476145879 +0000
committer android-build-merger <android-build-merger@google.com> 1476145879 +0000

Merge "NuPlayer: return error when neither audio nor video source has metadata." into nyc-mr1-dev
am: c486e13446

Change-Id: I67e3f8cf5fa628e67ce1515f9cf307bc7b9e8cd0