am 8bc2495e: am de88c515: Merge change 25286 into eclair
am 8bc2495e: am de88c515: Merge change 25286 into eclair

Merge commit '8bc2495e5ee83d2815b3e7ed151271dae057db67'

* commit '8bc2495e5ee83d2815b3e7ed151271dae057db67':
  Fix sdk 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