tree 222e862793e4b12f8db9be186ce0d41a84dd0191
parent e2617e7c1de3c9f4224baf3952a98a612e05bae2
parent a48066131ac9e7c8e823d82e11c502aa9980f322
author Nicholas Sauer <nicksauer@google.com> 1423616003 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423616003 +0000

am a4806613: am b47d4caf: 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 'a48066131ac9e7c8e823d82e11c502aa9980f322':
  Fix typo in streaming media url