am 930ab3d9: Fix broken sdk build.
am 930ab3d9: Fix broken sdk build.

Merge commit '930ab3d955a40c1de167b7142215af37f9f9bfe4' into eclair-mr2-plus-aosp

* commit '930ab3d955a40c1de167b7142215af37f9f9bfe4':
  Fix broken 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