am 47de55ab: am 0ca6912a: resolved conflicts for merge of a0cd2ea1 to gingerbread-plus-aosp

* commit '47de55ab634c08a1554adb50423cefc15235d600':
  Don't set ARM flags for non arm builds
tree: da0b8059609dda8ace29be4808b8a70e73bda633
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk