tree 41bba697946c564e802171e4bd599f9278b6a4e1
parent fc667dabcfec3d1903b0058aff158bd7b687ab4d
parent 235073a549ec664caea93e0ccded95e4a6819b6b
author Andreas Huber <andih@google.com> 1277314303 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277314303 -0700

am 235073a5: am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread

Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'

* commit '235073a549ec664caea93e0ccded95e4a6819b6b':
  Make sure sine: is supported again in stagefright commandline tool.