am 6f2f6382: am 01248f0f: Merge change 23103 into eclair
am 6f2f6382: am 01248f0f: Merge change 23103 into eclair

Merge commit '6f2f6382aa4e5d2d1f92b20a22c17ca7fce5dd7d'

* commit '6f2f6382aa4e5d2d1f92b20a22c17ca7fce5dd7d':
  Fixing the 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