tree c1a08d86ce22e55b33a88b7fbab8c28b2bb9ffa1
parent 4f2074980eefeabe2a37ea5d6dc5904a87107fc4
parent 66d6f1fcd9cb80a603b833e93779eb0dfb5e67ee
author Andreas Huber <andih@google.com> 1279742673 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279742673 -0700

am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread

Merge commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e' into gingerbread-plus-aosp

* commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e':
  Add a seek test to the stagefright commandline tool.