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