tree 84ac0115f7a4656ee6f9828a9e5e385503836657
parent 9c1cbe8373f28c9a6d6ba489af3e9247647dc469
parent ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d
author Elliott Hughes <enh@google.com> 1389746008 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389746008 +0000

am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit."

* commit 'ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d':
  Fix fastbootd build for 64-bit.