tree b584d660f25525a79993513fcd55ec227207ee67
parent e9103a17dd0957e3dd21c2b424e03ac79faf4192
parent 8f8bffd61352915af9d7af6d0279ada039a58d7e
author Andreas Huber <andih@google.com> 1344545510 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344545510 -0700

am 8f8bffd6: am faa88edb: Merge "Fix static sample table processing, add support for h.263 video." into jb-mr1-dev

* commit '8f8bffd61352915af9d7af6d0279ada039a58d7e':
  Fix static sample table processing, add support for h.263 video.