am ea483723: am 9fbb534e: Merge change Iafbeb31b into eclair-mr2
am ea483723: am 9fbb534e: Merge change Iafbeb31b into eclair-mr2

Merge commit 'ea483723b3cc630cf5b5b6fda7b08d9592bdbbde'

* commit 'ea483723b3cc630cf5b5b6fda7b08d9592bdbbde':
  Maybe really fix windows 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