tree 5ca4b3ca08c2ee8ac0afe65719859b1ce92ff71b
parent daf6f406bfb4654b0ad104a4ea623f515fcb0b6b
parent c67a10e6a443042414ddb3322de51b8ccdba8b21
author David 'Digit' Turner <digit@google.com> 1310423820 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310423820 -0700

am c67a10e6: resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp

* commit 'c67a10e6a443042414ddb3322de51b8ccdba8b21':
  Use the standard NDK,SDK versions so that we pick up the correct crt files
  Use __ANDROID__ to prepare for upcoming arm_linux_androideabi toolchain.
  Don't use stale NDK libraries for IA