am 285f2422: Merge change I28bad882 into eclair
am 285f2422: Merge change I28bad882 into eclair

Merge commit '285f242214d38352b844898edffc8eb336d0c19e' into eclair-plus-aosp

* commit '285f242214d38352b844898edffc8eb336d0c19e':
  Fix broken 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