| commit | 4cd308c6e78c56eb98330fe19232f236475da979 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Aug 21 09:46:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 21 09:46:55 2013 -0700 |
| tree | 1815892d48efde241e440f15d8c8859d6fe1bde9 | |
| parent | e9719755e6103493cbf49da38e0713b2f6b10700 [diff] | |
| parent | 4a852f26238c10941c1176cdecf6b1e2f83d44e9 [diff] |
am 4a852f26: Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev * commit '4a852f26238c10941c1176cdecf6b1e2f83d44e9': Fix StreamingMediaPlayerTest