commit 07dd5a5a9cf8ea7c48473874b34d0dc6c5a6c231
author Andreas Huber <andih@google.com> Tue Apr 13 12:23:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 13 12:23:28 2010 -0700
tree 5297c0671092e9911ad730fa69837c7968d7ddbe
parent ea623087e93c6e27ce6284946f94c1d4aff7f91b
parent 25801bfe64dff414991fca2f62f16a61ba554357

am 30e9c2d4: 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"." in

Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken

* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
  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".