tree 4966e1ae06a8d508207ff102b2166ade73f89617
parent f9a6b37b56ec119a62af9c3833901c3193b86348
parent 6cab21b62a57148f414c0923b5a01a33ba75961b
author Nicholas Sauer <nicksauer@google.com> 1423611499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423611499 +0000

am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev

* commit '6cab21b62a57148f414c0923b5a01a33ba75961b':
  Fix typo in streaming media url