tree 56ced2a12c06d200b9919ff4f9e336a59469ea06
parent a07896f465f1d38f330584b762efa6090ecbdc6e
parent 5348dc86f3ac3cebebcda271cf990dbcc87f5a7f
author James Dong <jdong@google.com> 1305761600 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305761600 -0700

am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2

* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
  Using widevine:// to stream adaptive bitrate wvm content no longer