tree d644b883a1c76d476f0818a5b3f9d4e89263f4dd
parent e42b3f0586b5055eeb1e77c4b5d52001fcff9c90
parent 76dca1640402e43854feda311b1bfe174afea664
author Mihai Niță <mnita@google.com> 1461269018 +0000
committer android-build-merger <android-build-merger@google.com> 1461269018 +0000

Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d
am: 76dca16404

* commit '76dca1640402e43854feda311b1bfe174afea664':
  Framework: change the TTS text to use the current locale

Change-Id: Iaabcdac0fd1bf8c6d3d6d3a9b7e87ca911518949