tree 1528ee1f0b054ff5536ff59fed9b8e69a2da4133
parent 6dd2d0f5dcefff00b27747a88ec66cdc9b16de0c
parent b47d4caff222e0e7b20aa560fecad434ad213ebc
author Nicholas Sauer <nicksauer@google.com> 1423615592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423615592 +0000

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 'b47d4caff222e0e7b20aa560fecad434ad213ebc':
  Fix typo in streaming media url