tree 085fb91fb738afbe284206fd06eb3e9e017d707f
parent 86eecf4686b510fcbe6316f77414d30fb9c50390
parent a029dcc0803ed62903dfa8459a736e5322643d77
author Nicholas Sauer <nicksauer@google.com> 1423612965 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423612965 +0000

am a029dcc0: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev

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