tree dc60ea01c8371048d0aa5b1c4108f9344b9c1990
parent 1eba16a5771fb8e5819af8addcb9f1714d1b3351
parent fe32ca761e7b1592c47f2ae9a873b28c7ea58f9b
author Nicholas Sauer <nicksauer@google.com> 1423613479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423613479 +0000

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