tree eceaaa8945d7e04c90a33c39853d69471aa327fd
parent ca389b9048c0273d34e495809986441803f35d28
parent 481fed17fad5141154d8cf9532c0803ade24a6a6
author Colin Cross <ccross@android.com> 1392327480 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392327480 +0000

am 481fed17: am f10efbc1: Merge "make 64-bit builds into multiarch builds"

* commit '481fed17fad5141154d8cf9532c0803ade24a6a6':
  make 64-bit builds into multiarch builds