| commit | 26b6175d47f069589cc4220b89810b2e8dfdcb21 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Mon Aug 26 18:05:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 18:05:59 2013 -0700 |
| tree | 708d15dfe189c07c4211ed2fccbb360a5b4cd398 | |
| parent | 8c54c6ecc4f2098317168f28bc5b8e67054c3a37 [diff] | |
| parent | fb69bff5dfb5a068001abf39fa45df3f845357ea [diff] |
am fb69bff5: am 3bbf1983: am 8bf744d4: am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev * commit 'fb69bff5dfb5a068001abf39fa45df3f845357ea': Fix StreamingMediaPlayerTest