am 5e6ad478: Merge change 22496 into eclair
am 5e6ad478: Merge change 22496 into eclair

Merge commit '5e6ad4786d599e17c1736cf52e5846a44e19d374' into eclair-plus-aosp

* commit '5e6ad4786d599e17c1736cf52e5846a44e19d374':
  fix typo

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