tree 6b358ee7f162882e112e570da1c36cfbedfb1da9
parent 880801ecacd93ffb2c8209dbd16aaac0500681a9
parent 828ffc4abfc99ff47edf7e485a3da82ecc49ea26
author Ying Wang <wangying@google.com> 1394561808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394561808 +0000

am 828ffc4a: Merge "Fix multilib build."

* commit '828ffc4abfc99ff47edf7e485a3da82ecc49ea26':
  Fix multilib build.