| commit | e83f30726a7a7221b06d6b022427456fd7bffa9b | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Nov 12 12:08:04 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 12:08:04 2012 -0800 |
| tree | 4d875cd49ff4811820ed3a43266a1c044ba52d71 | |
| parent | b50e7e0f8a81e8a802896211c4c2448143d3325e [diff] | |
| parent | 8b73fc1ad3c0698de1ee2a9a8672e55a66ac6f9e [diff] |
am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev * commit '8b73fc1ad3c0698de1ee2a9a8672e55a66ac6f9e': DO NOT MERGE Control access to tts objects