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