tree 708d15dfe189c07c4211ed2fccbb360a5b4cd398
parent 8c54c6ecc4f2098317168f28bc5b8e67054c3a37
parent fb69bff5dfb5a068001abf39fa45df3f845357ea
author Bryan Mawhinney <bryanmawhinney@google.com> 1377565559 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377565559 -0700

am fb69bff5: am 3bbf1983: am 8bf744d4: am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev

* commit 'fb69bff5dfb5a068001abf39fa45df3f845357ea':
  Fix StreamingMediaPlayerTest