| commit | 9e44cbbee43950d9083fc0eb3fae1b9e4752f8aa | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Aug 21 09:53:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 21 09:53:25 2013 -0700 |
| tree | 7ea8f0beef0195cd941cbb7e23d31aee8e6bd861 | |
| parent | dc0efa91d0044ef15df59e09080d4011fa372251 [diff] | |
| parent | 36faa19047d340f1cb7a8e92f3f6c0c9cc3e6a20 [diff] |
am 36faa190: am d049a515: am 4cd308c6: am 4a852f26: Merge "Fix StreamingMediaPlayerTest" into jb-mr2-dev * commit '36faa19047d340f1cb7a8e92f3f6c0c9cc3e6a20': Fix StreamingMediaPlayerTest