tree 07be48581fbe164b1d9f28a167292fe0f8493111
parent d5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b
parent 87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a
author Ying Wang <wangying@google.com> 1408058406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408058406 +0000

am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build."

* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
  Fix 64-bit host build.