tree 7b8054f9f20f8bee2ce01e1fdc3ca72f4237e874
parent fdce3778fbb3dd91ebc4d5fff9fd85fe8991d049
parent 5a4e4804aa5340a4cf7ef4250d31fd901f53ddb2
author James Dong <jdong@google.com> 1305760198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305760198 -0700

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

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