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