tree f9a2f502b194ef5ff8b1e93d2879c340370d7f47
parent cf05e0c263bb9977480957049e7813b58276364a
parent ab0bb72da3471d99ef9bdc0250579dbb3bc41ae7
author Nicholas Sauer <nicksauer@google.com> 1423610977 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423610977 +0000

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

* commit 'ab0bb72da3471d99ef9bdc0250579dbb3bc41ae7':
  Fix typo in streaming media url