tree 8052cf774783ba72cf71b1a558cab920b42168a9
parent 9c418157014d26e2dfd8a002e35a0e9a62db3caa
parent 888442b44c4f041fba6050cb25a64454b9a04aa7
author Nicholas Sauer <nicksauer@google.com> 1423616445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423616445 +0000

am 888442b4: 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 '888442b44c4f041fba6050cb25a64454b9a04aa7':
  Fix typo in streaming media url