tree 6a9eb9a504bc9cb183bfff0757e99800f35cf12e
parent 5415835c41fbdab2e921c7ae2dddea6b2a4bf1fa
parent e75315fdef200600f280f829089fd8d32e662b2e
author Ying Wang <wangying@google.com> 1400296431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400296431 +0000

am e75315fd: am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts"

* commit 'e75315fdef200600f280f829089fd8d32e662b2e':
  Real "LOCAL_MULTILIB := both" for prebuilts