summaryrefslogtreecommitdiffstats
path: root/media/mtp/mtp.h
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-06 18:54:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-06 18:54:26 -0700
commit10e9f7c8e564b4bab036c56d1d59d9518c452305 (patch)
tree04d90df171f3dd9a7399bc84eb8245f1b2da569d /media/mtp/mtp.h
parent22d12e77f159751d50d3548f1aef18107c9c4089 (diff)
parent2500c2d6ff55c26452ccba925a9f8b86b926f43e (diff)
downloadframeworks_av-10e9f7c8e564b4bab036c56d1d59d9518c452305.zip
frameworks_av-10e9f7c8e564b4bab036c56d1d59d9518c452305.tar.gz
frameworks_av-10e9f7c8e564b4bab036c56d1d59d9518c452305.tar.bz2
am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp * commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba': Properly skip the 'skip' chunk in mpeg4 files.
Diffstat (limited to 'media/mtp/mtp.h')
0 files changed, 0 insertions, 0 deletions