tree 245daa6e9375758215273cd43f493b774ab6ef95
parent 86ed1dbaa74e1c5b21f98dbb74f2b600a9025470
parent b1047a99ce8b8d62ef911c5dfba7183c32e80a70
author David Turner <digit@android.com> 1300799020 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300799020 -0700

am b1047a99: Merge changes I00c75f37,I1fc3cb49

* commit 'b1047a99ce8b8d62ef911c5dfba7183c32e80a70':
  x86: the -mbionic flag is needed for IA builds.
  x86: qemu emulator is the default build target