am 1d0df82b: Merge "Include cpufeatures in ndk/Android.mk" into froyo
Brian Muramatsu authored
Merge commit '1d0df82b' into kraken

* commit '1d0df82b':
  Include cpufeatures in ndk/Android.mk
f390d512