diff options
| author |   Marco Nelissen <marcone@google.com> | 2012-11-16 11:15:37 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2012-11-16 11:23:33 -0800 |
| commit | ea23a2855757074197671cab4211c547a8f92f30 (patch) | |
| tree | 8a187ceebf7f1c479942806365496833d6484002 /java/src/com/android/inputmethod/annotations/UsedForTesting.java | |
| parent | 3a9f84a197887ef9ab44c925f79863a707e6bffc (diff) | |
| parent | 6f42cf1deeeeb8be2060afc02204dac28b275119 (diff) | |
| download | latinime-ea23a2855757074197671cab4211c547a8f92f30.tar.gz latinime-ea23a2855757074197671cab4211c547a8f92f30.tar.xz latinime-ea23a2855757074197671cab4211c547a8f92f30.zip | |
resolved conflicts for merge of 6f42cf1d to master
Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180
Diffstat (limited to 'java/src/com/android/inputmethod/annotations/UsedForTesting.java')
0 files changed, 0 insertions, 0 deletions