am 12348492: am b5501d0e: Merge change 26719 into eclair
am 12348492: am b5501d0e: Merge change 26719 into eclair

Merge commit '12348492e1808cb1d8288e0948741e1cae335fcb'

* commit '12348492e1808cb1d8288e0948741e1cae335fcb':
  fix simulator build

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