am 1e09e9e0: Merge change 22650 into eclair
am 1e09e9e0: Merge change 22650 into eclair

Merge commit '1e09e9e0d09602ee84a299f09b451db686ff6c40' into eclair-plus-aosp

* commit '1e09e9e0d09602ee84a299f09b451db686ff6c40':
  Fix build break

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