diff options
| author | Gilles Debunne <debunne@google.com> | 2011-03-14 13:43:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 13:43:30 -0700 |
| commit | 467016e88a72939bd6cfb024d56a605f5c918267 (patch) | |
| tree | c4abd7fae1e2b31973da821fd6ad90178c62cdfd /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | fd10d5cf56e5b1ba7692400e4fe4ae26b61f3285 (diff) | |
| parent | 7069f7c0e78bf01bf83a5c14025525b8604f16b9 (diff) | |
am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
* commit '7069f7c0e78bf01bf83a5c14025525b8604f16b9':
Double tap on a word no longer opens context menu. DO NOT MERGE
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions