tree e1f2c925f98ccafd58f22a0bbce5d738fbd05307
parent e76cb0f68c4a90788e550936646d12fb8b1caa3d
parent 3d1db89f8d677d16aa383499e26d6fa11a3a1510
author Nicholas Sauer <nicksauer@google.com> 1423616713 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423616713 +0000

am 3d1db89f: 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 '3d1db89f8d677d16aa383499e26d6fa11a3a1510':
  Fix typo in streaming media url