| commit | 8bf744d468680d08a6e5ac1f32d5b56aa5d299e3 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Mon Aug 26 17:53:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 17:53:59 2013 -0700 |
| tree | dc1a597fed13b3b1efdf986293c12f57b555e7c5 | |
| parent | e3ee0b908d349064097de02ad7a4e9210deb5a22 [diff] | |
| parent | 5c566a2a60e3d6b4eb4cff7c61100cb1326ce1d1 [diff] |
am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev * commit '5c566a2a60e3d6b4eb4cff7c61100cb1326ce1d1': Fix StreamingMediaPlayerTest