tree cd81989e86180ae13c2ffd3f1a2faa73c4f35415
parent 5028a1a1b5534a5abc4f15cb5ae0c1a5f0554a90
parent 4533f807598aaacc34ca0861ad1c8a948985a55b
author Nicholas Sauer <nicksauer@google.com> 1423614312 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423614312 +0000

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