tree 4659275e440a205b1e55f6ee8d3372d2acefd29f
parent 79b46720e606e3db5fff87f672b73613a9a19c69
parent a45a5d27972070895001571b7912655b0bd0931c
author Ying Wang <wangying@google.com> 1402442932 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402442932 +0000

am a45a5d27: Merge "Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn\'t restricted"

* commit 'a45a5d27972070895001571b7912655b0bd0931c':
  Set default LOCAL_MULTILIB only if LOCAL_MODULE_HOST_ARCH isn't restricted