tree fa56ff32d6ef604d31572ad3ca4d2a7f0f637f7b
parent a8e1d119630ca3d351262ca3f3a11dda4e6edf75
parent 624ea44120dcf8e7305bbb54072417f189855187
author Mike Cleron <mcleron@google.com> 1352234640 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234640 -0800

am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev

* commit '624ea44120dcf8e7305bbb54072417f189855187':