diff options
author | Andreas Huber <andih@google.com> | 2010-08-06 19:06:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-06 19:06:52 -0700 |
commit | fb6dcdf8ebe5b2995f53a750473396a40fd2db8d (patch) | |
tree | 75b0099972178dbbe48089df33ab879763128299 /media/mtp/mtp.h | |
parent | ca2fa61ef03cac008ea86e6fe16b2e5f9f1a2be3 (diff) | |
parent | 10e9f7c8e564b4bab036c56d1d59d9518c452305 (diff) | |
download | frameworks_av-fb6dcdf8ebe5b2995f53a750473396a40fd2db8d.zip frameworks_av-fb6dcdf8ebe5b2995f53a750473396a40fd2db8d.tar.gz frameworks_av-fb6dcdf8ebe5b2995f53a750473396a40fd2db8d.tar.bz2 |
am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55'
* commit '4f25d03382ca01a00c6f0e0967c5edf302f62b55':
Properly skip the 'skip' chunk in mpeg4 files.
Diffstat (limited to 'media/mtp/mtp.h')
0 files changed, 0 insertions, 0 deletions