commit | a96b34638875bf36b491191052eed7a644bfb6e2 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Thu May 28 17:11:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 28 17:11:14 2015 +0000 |
tree | 5d4f41678c28d308029691c498cfb3acbfd3eb8e | |
parent | ecd9ca314cb9c00741fd3be37de3bfdfb51755b7 [diff] | |
parent | 1451c976d5af22812ce7fedd0456090acb6c7f81 [diff] |
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 '1451c976d5af22812ce7fedd0456090acb6c7f81':