tree f12ba8806230cba8715992b04bb707bbca3cd287
parent 3a4b39608b6912150c73a9c3eccfc344bb8f6aa5
parent fe81d3d78891b3b5025a6ca24736cad8d5bf9f25
author Andrew Hsieh <andrewhsieh@google.com> 1341332752 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341332752 -0700

am fe81d3d7: Merge "[MIPS] Use NDK libs for ARM builds only"

* commit 'fe81d3d78891b3b5025a6ca24736cad8d5bf9f25':
  [MIPS] Use NDK libs for ARM builds only