tree eafa569308ee0205a2c66f54db291bc344871c08
parent 280230f73a9d6398da94bf8c1389086dcae92a89
parent cb1a4ed6718df32063e7877903a484f8e38877f7
author Brian Carlstrom <bdc@google.com> 1352874714 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352874714 -0800

am cb1a4ed6: Merge "Use NDK libraries for x86 and MIPS build."

* commit 'cb1a4ed6718df32063e7877903a484f8e38877f7':
  Use NDK libraries for x86 and MIPS build.