tree 46b417bbab3cd5eb820568bb5e490b2e539087b4
parent 765aef9c13cf85b2297fc7bc7bb1e7e8059b01bd
parent b6e70fce5365c596a7b0b22cd3ba75c5d7ef6430
author Elliott Hughes <enh@google.com> 1389746335 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389746335 +0000

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

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