summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2015-02-04 21:35:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 21:35:41 +0000
commitc42ab4fcd42875ef74f8e9b8d8150f7bcfd0cd3b (patch)
treeee11d0c8c9c4d1cdf46083ba49fea6370ada2c66 /include
parentd6ad19fef4d5230f1003a3adc756d30b9338cdcf (diff)
parent7dbbc7ec95c3040668388162a0ffbc45b68af6f1 (diff)
downloadframeworks_av-c42ab4fcd42875ef74f8e9b8d8150f7bcfd0cd3b.zip
frameworks_av-c42ab4fcd42875ef74f8e9b8d8150f7bcfd0cd3b.tar.gz
frameworks_av-c42ab4fcd42875ef74f8e9b8d8150f7bcfd0cd3b.tar.bz2
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.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions