tree 79027c223cb748b2dbdb52dfc682457620adf468
parent 287ad838d97b3215a295bd9ebc0d322ba0a12fe5
parent 1437426d01ff60986f2e9f44f4e118381a0bdcdd
author Nicholas Sauer <nicksauer@google.com> 1442279330 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442279330 +0000

am 1437426d: am 67da8d81: am 86e0f83c: am 3d1db89f: am 888442b4: am a4806613: am b47d4caf: am 757d18ee: am 4262e900: am 4533f807: am fe32ca76: am a029dcc0: am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb

* commit '1437426d01ff60986f2e9f44f4e118381a0bdcdd':