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