OSDN Git Service

Merge changes I00c75f37,I1fc3cb49
authorDavid Turner <digit@android.com>
Tue, 22 Mar 2011 12:50:56 +0000 (05:50 -0700)
committerAndroid Code Review <code-review@android.com>
Tue, 22 Mar 2011 12:50:56 +0000 (05:50 -0700)
commitb1047a99ce8b8d62ef911c5dfba7183c32e80a70
treea4d6e57b5c81effcb362cdd950c135d1e7c6f26a
parent757248269bfbe2390a2d04e1d69fb5a0742f3025
parent2e8283d9bcb3a4d92868b36f523e8dce2a851ddc
Merge changes I00c75f37,I1fc3cb49

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