tree ef92d430bb06bfed08698819a565b42adfc531a9
parent 65b59f5035686f63ebc7d4f8ccc1172b30618ee6
parent 2b4bc305a2305d1dda66e054d228b4708575ff8d
author Geremy Condra <gcondra@google.com> 1352413599 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352413599 -0800

am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev

* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects