tree dc1a597fed13b3b1efdf986293c12f57b555e7c5
parent e3ee0b908d349064097de02ad7a4e9210deb5a22
parent 5c566a2a60e3d6b4eb4cff7c61100cb1326ce1d1
author Bryan Mawhinney <bryanmawhinney@google.com> 1377564839 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377564839 -0700

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

* commit '5c566a2a60e3d6b4eb4cff7c61100cb1326ce1d1':
  Fix StreamingMediaPlayerTest