summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-18 08:05:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 08:05:09 -0700
commit3e00cc070090fa3eab16792da90aa33823cd6db1 (patch)
tree7418eedd47a1cc84b79266abed5b81b55c2207bf /media/libstagefright/httplive
parentb0d62457a9630b144187dcd5b143ee9c91f591d0 (diff)
parent30550ba7a19372daa7424710ca1367bb7299e459 (diff)
downloadframeworks_av-3e00cc070090fa3eab16792da90aa33823cd6db1.zip
frameworks_av-3e00cc070090fa3eab16792da90aa33823cd6db1.tar.gz
frameworks_av-3e00cc070090fa3eab16792da90aa33823cd6db1.tar.bz2
am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4' * commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Diffstat (limited to 'media/libstagefright/httplive')
0 files changed, 0 insertions, 0 deletions