tree 33c46463140c7bf6c2125f9cc8edd1a74a544940
parent 393e1459340effdb8bdc6531e22c0976d0aea026
parent 45bac57aa00281e6b45756c691c588bdaf762521
author Andreas Huber <andih@google.com> 1278004037 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278004037 -0700

am 45bac57a: Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.

Merge commit '45bac57aa00281e6b45756c691c588bdaf762521' into gingerbread-plus-aosp

* commit '45bac57aa00281e6b45756c691c588bdaf762521':
  Support for writing the extracted data to an .mp4 file in the stagefright commandline tool.