tree d4e9a2a6ec5b3b7177a9ea9e6ef585993ad18a20
parent a939d667261041b51bfa2cc746d0f6c3b6a66207
parent db9ab02c090cdc5d2b31399867a4052351b8793d
author Ying Wang <wangying@google.com> 1355539247 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355539247 -0800

am db9ab02c: (-s ours) Build against the NDK for x86 and mips too.

* commit 'db9ab02c090cdc5d2b31399867a4052351b8793d':
  Build against the NDK for x86 and mips too.