| commit | 27d2d9ef234f9e1deedde73888d959a542528392 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Mon Aug 26 18:40:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 26 18:40:08 2013 -0700 |
| tree | bb05f7acda40f9ec95efeca8f7ffec6b17672a4b | |
| parent | 0a5a00ccf1e90dac842a557b6aa052f3f5700e32 [diff] | |
| parent | 6d8abfb81c33467f5dc277b7792692f0a6ecef77 [diff] |
am 6d8abfb8: am 86f58534: am 26b6175d: (-s ours) am fb69bff5: am 3bbf1983: am 8bf744d4: am 5c566a2a: am 679e8dea: Merge "Fix StreamingMediaPlayerTest" into jb-dev * commit '6d8abfb81c33467f5dc277b7792692f0a6ecef77': Fix StreamingMediaPlayerTest