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

Merge commit 'f0d87989931757cdc50524d282fc151ef88eeafe'

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