tree e25ea89cec6b05f8d66d81eb2d7ebaa3f95d7289
parent 0969f15c56e984144ab952987ad6e3c330ff8028
parent e610cae33ab4fa0e7877c6e99275e9ff5c600dd4
author Nicholas Sauer <nicksauer@google.com> 1423610676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423610676 +0000

am e610cae3: Merge "Fix typo in streaming media url" into jb-dev

* commit 'e610cae33ab4fa0e7877c6e99275e9ff5c600dd4':
  Fix typo in streaming media url