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

Merge commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b' into eclair-mr2-plus-aosp

* commit '9fbb534ebddb2ae43e862a3bc0ff5859358b194b':
  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