fixed SDL compilation in Lion, and enabled SDL compilation in Mac OS X
fixed an emulator crash for multiple displays in OSX
Changed memcpy -> memcmp in the AT+COPS=? impl.

This enables support for REQUEST_NETWORK_SELECTION_*
in the emulator's rild and modem.
Merge branch 'master' of git://github.com/android/platform_external_qemu
fix primitive type overrides in Mac OS X
Merge branch 'master' of https://android.googlesource.com/platform/external/qemu into b2g_master
Bug 759637: enable network selection mode changing in the emulator
Bug 768608 - test failure: dom/telephony/test/marionette/*.js | ScriptTimeoutException: timed out
(Add AT+CEER in android_modem)
Bug 780558: add 'gsm location <lac> <ci>' console command
Merge pull request #3 from vicamo/bugzilla/780558/master

Bug 780558: add 'gsm location <lac> <ci>' console command
Bug 785988: Allow setting operator names
Merge pull request #4 from vicamo/bugzilla/785988/master

Bug 785988: Allow setting operator names
Add reference comments for hard-coded sim records
Bug 788191: answer valid EFspn
Merge pull request #6 from vicamo/bugzilla/788191/master

Bugzilla/788191/master
Merge pull request #2 from hsinyi/master

Add "AT+CEER" in telephony/android_modem, fix #1.
STK emulation: Adding STK support to the emulator

STK proactive commands are issued as 'AT' commands.
Merge pull request #7 from psiddh/stk_qemu_emulation_changes

Bug 809284: STK emulation: Adding STK support to the emulator
Bug 790463: Fix crash caused by missing call states
Merge pull request #8 from shianyow/bug790463_emulator_crash

Bug 790463: Fix crash caused by missing call states