summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-02-04 21:31:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 21:31:32 +0000
commit7dbbc7ec95c3040668388162a0ffbc45b68af6f1 (patch)
tree540ab0a703ebac5d8384c05dc17996177dd35de8 /include
parent3b5d119522bdf9c23be622be395d7a95d465616e (diff)
parenta291dabcab10cafc1749d1d9493d269049502256 (diff)
downloadframeworks_av-7dbbc7ec95c3040668388162a0ffbc45b68af6f1.zip
frameworks_av-7dbbc7ec95c3040668388162a0ffbc45b68af6f1.tar.gz
frameworks_av-7dbbc7ec95c3040668388162a0ffbc45b68af6f1.tar.bz2
am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start time in conjunction." into lmp-mr1-dev
* commit 'a291dabcab10cafc1749d1d9493d269049502256': httplive: Set start time and segment start time in conjunction.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions