| commit | 376aebdc9d92efed4928523227381ea18a4cb0cc | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Wed May 21 18:13:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 18:13:18 2014 +0000 |
| tree | b45603e8a29d4f990bb676918e487e04f339d642 | |
| parent | 153c7aabdc1de609188ce2441442f985f75d4399 [diff] | |
| parent | 76d057b9708f92662a3002cffd55ecc05a860df4 [diff] |
am 76d057b9: Merge "toolbox: fix x86 build" * commit '76d057b9708f92662a3002cffd55ecc05a860df4': toolbox: fix x86 build