tree 807a81b6cd94bf998cfeaf7bf08d9422acdc68e7
parent b16cf676bd3304bc0c5da4210d689f4e680219b1
parent 7c55c3f5f5997ca572d70ad513099a5af20a23c1
author Andreas Huber <andih@google.com> 1260402455 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260402455 -0800

am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.

Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp

* commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1':
  Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.