tree dd2134fbd52e09dfce2874cc59505d97fdac150a
parent d81ef83a493a27887b795fdf9ece391155779914
parent 5edae619a6ad7337a3d14b53f7665ff17ec3ee84
author Chia-chi Yeh <chiachi@android.com> 1283231199 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283231199 -0700

am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.

Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp

* commit '12006013cc2cd0a076855ed068f5f782b24631c3':
  fixedfft: Only includes cpu-features.h when __arm__ is defined.