tree ee189912af5c8bc79169b4e1c722a803d1a62b35
parent 2bbda71148e97f2c411d4272e96f075b99da7c1c
parent 0eecaad0f873bdd50cb9dd6485ce584da57f0548
author Edwin Wong <edwinwong@google.com> 1347411336 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347411336 -0700

am 64d6c687: Merge "Add getError and setError to propagate error code from WVMMediaExtractor up to player." into jb-mr1-dev

* commit '64d6c687e75b93c0c8372ed3807e1bb68c1f09ed':
  Add getError and setError to propagate error code from WVMMediaExtractor up to player.