am 1a21de56: Merge change 2961 into donut
am 1a21de56: Merge change 2961 into donut

Merge commit '1a21de56b9e3e69413ee6addc0e776b40f79782e'

* commit '1a21de56b9e3e69413ee6addc0e776b40f79782e':
  Addressed comments of change 2515 for the TtsService class:

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