am 91a5d831: am b5308a70: Merge change 24816 into donut
am 91a5d831: am b5308a70: Merge change 24816 into donut

Merge commit '91a5d831d6e2311d4129cb6086a67ab66874992c' into eclair-plus-aosp

* commit '91a5d831d6e2311d4129cb6086a67ab66874992c':
  TextToSpeech javadoc update.

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