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