commit 5cfe7910a387a4976290d91bd6ea0408984a9431
author Andreas Huber <andih@google.com> Tue Apr 13 12:20:09 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 13 12:20:09 2010 -0700
tree 3e5f86120f1ff365c1753580da989ae35d07c503
parent 263f52f58e32d691d0c8057ef7376ece085f50df
parent daeec8c5b335ba84aa932a80e6319be5d71f1956

am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo

Merge commit 'db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp

* commit 'db281311a0e957ba989509cf11f2085b4db12074':
  Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".