am 50bd2992: am 5a463a69: Merge change Ic2a16d4f into eclair
am 50bd2992: am 5a463a69: Merge change Ic2a16d4f into eclair

Merge commit '50bd2992b1917d14c5bc79659820e4017c7e049c'

* commit '50bd2992b1917d14c5bc79659820e4017c7e049c':
  b/2148252 Fix emulator

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base