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