tree f79e6de865348ee168c725ee9904f1db0a6f21ca
parent 02ee88da2b803c3b9acd4980fa72f7a30187c247
parent 540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a
author Ian Rogers <irogers@google.com> 1401999245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401999245 +0000

am 540e7ee8: Merge "Build on host as 32-bit as there are 64-bit bugs in this code."

* commit '540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a':
  Build on host as 32-bit as there are 64-bit bugs in this code.