tree fd4f36b8a38bb5bb70ef233ae889c3ee2cd14879
parent 5158e88db175808a0229c8733e944a3abcf26d3a
parent a2f89660b4d427c34884109cf70655f20d84d2ad
author Andreas Huber <andih@google.com> 1277226664 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277226664 -0700

Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread