| commit | 66722677772a6b8e90f3e2301b68f4b0c147e29a | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Mar 19 21:45:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 19 21:45:26 2014 +0000 |
| tree | 6f9298365ec3e93d93bcc3824ddf0861d423fd83 | |
| parent | f3eba4663aa57839510f763e852fa625855c47b5 [diff] | |
| parent | dca279724607776e654f50c14540253d3e24a13b [diff] |
am dca27972: Merge "StreamingMediaPlayerTest: Add tests for HLS served locally" into klp-dev * commit 'dca279724607776e654f50c14540253d3e24a13b': StreamingMediaPlayerTest: Add tests for HLS served locally