diff options
| author | Geremy Condra <gcondra@google.com> | 2012-11-12 12:19:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-12 12:19:15 -0800 |
| commit | 2836288d25f248dc3570288259e3134bfd14d9af (patch) | |
| tree | 6d8d572c64cc1a83dbdefe3ce6b9debf815a53ee /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 38411f72ba1b2f9589c9a9a1a6059f6f480cf632 (diff) | |
| parent | 09c5e2474dad4fd043c6c18d7f366dbcb3066eef (diff) | |
am 09c5e247: (-s ours) am 5ba82714: am 3012b393: am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
* commit '09c5e2474dad4fd043c6c18d7f366dbcb3066eef':
DO NOT MERGE Control access to tts objects
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions