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.
tree: 04d90df171f3dd9a7399bc84eb8245f1b2da569d
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/