am 4f25d033: am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
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.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base