diff options
| author | Gilles Debunne <debunne@google.com> | 2011-03-14 13:41:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 13:41:14 -0700 |
| commit | 7069f7c0e78bf01bf83a5c14025525b8604f16b9 (patch) | |
| tree | 00ef28af69c717003e1b0b4b262ffdc2765e6f05 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb8971106e5ea105e176c995c1ff3b4fbe630710 (diff) | |
| parent | 816dd3d443108b473965f97123eef7300f53615f (diff) | |
am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
* commit '816dd3d443108b473965f97123eef7300f53615f':
Double tap on a word no longer opens context menu. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions