| commit | c42ab4fcd42875ef74f8e9b8d8150f7bcfd0cd3b | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Wed Feb 04 21:35:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 04 21:35:41 2015 +0000 |
| tree | ee11d0c8c9c4d1cdf46083ba49fea6370ada2c66 | |
| parent | d6ad19fef4d5230f1003a3adc756d30b9338cdcf [diff] | |
| parent | 7dbbc7ec95c3040668388162a0ffbc45b68af6f1 [diff] |
am 7dbbc7ec: am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start time in conjunction." into lmp-mr1-dev * commit '7dbbc7ec95c3040668388162a0ffbc45b68af6f1': httplive: Set start time and segment start time in conjunction.