| commit | 3012b393616812258cee6b4922afdc49b01a22ae | [log] [tgz] |
|---|---|---|
| author | Geremy Condra <gcondra@google.com> | Mon Nov 12 12:10:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 12:10:27 2012 -0800 |
| tree | 6de247292ac54ed9af013cc3b0cdfa3e73139fd6 | |
| parent | 51e99cf91e18a4f0dd5449a122f356ae10727cdf [diff] | |
| parent | e83f30726a7a7221b06d6b022427456fd7bffa9b [diff] |
am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev * commit 'e83f30726a7a7221b06d6b022427456fd7bffa9b': DO NOT MERGE Control access to tts objects