tree e367159f9e4b3bb1a3ed4849fd407794b216af13
parent 7c5223ebabb7348abcf4189a9f06177c6f8dd05c
parent 679e8deaa19248f4fa6c1f6a80a4e34c4327d3fe
author Bryan Mawhinney <bryanmawhinney@google.com> 1377564660 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377564660 -0700

am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev

* commit '679e8deaa19248f4fa6c1f6a80a4e34c4327d3fe':
  Fix StreamingMediaPlayerTest