tree 7532218fc4a2d28f4479b336016be871f68dfda5
parent 32816a40575ae11add1bc79bcc5dd57dece6d664
parent 26b6175d47f069589cc4220b89810b2e8dfdcb21
author Bryan Mawhinney <bryanmawhinney@google.com> 1377567094 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377567094 -0700

am 26b6175d: (-s ours) am fb69bff5: am 3bbf1983: am 8bf744d4: am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev

* commit '26b6175d47f069589cc4220b89810b2e8dfdcb21':
  Fix StreamingMediaPlayerTest