tree b45603e8a29d4f990bb676918e487e04f339d642
parent 153c7aabdc1de609188ce2441442f985f75d4399
parent 76d057b9708f92662a3002cffd55ecc05a860df4
author Greg Hackmann <ghackmann@google.com> 1400695998 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400695998 +0000

am 76d057b9: Merge "toolbox: fix x86 build"

* commit '76d057b9708f92662a3002cffd55ecc05a860df4':
  toolbox: fix x86 build