| commit | b2d5c7e36ce3aff1398b200e4e48160f6881f7c6 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:35:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:35:19 2015 +0000 |
| tree | 0470f4b79904b01d993b2d92c6db5bf0f75cc86d | |
| parent | 48169ababa58ac82873bb0d485568e620723d054 [diff] | |
| parent | dd7971da477f0c4b2198394101d8a083377c979a [diff] |
am dd7971da: am a96b3463: am 1451c976: am f012b4fc: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev automerge: a029dcc automerge: f569614 automerge: 64b4f92 automerge: 9ee3ede * commit 'dd7971da477f0c4b2198394101d8a083377c979a':