tree 6d236d0fb00134254d99a07578ab20867dce64c2
parent 2772992b7da57838cfbe1c6d48281d84798e3040
parent 757d18eee25d24a64aca33bdf6cc5d37b63775ea
author Nicholas Sauer <nicksauer@google.com> 1423615247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423615247 +0000

am 757d18ee: am 4262e900: am 4533f807: am fe32ca76: am a029dcc0: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev

* commit '757d18eee25d24a64aca33bdf6cc5d37b63775ea':
  Fix typo in streaming media url