am 0ef135d5: Merge change 21537 into eclair
am 0ef135d5: Merge change 21537 into eclair

Merge commit '0ef135d5c79ff5b443b43f8743250044700a8bb5'

* commit '0ef135d5c79ff5b443b43f8743250044700a8bb5':
  really be more friendly with C

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