diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-11-17 11:33:48 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-11-17 11:33:48 +0900 |
| commit | 41a2c10e72e02ce9215c867a67b87ecfcc725149 (patch) | |
| tree | 60b5b60bebf41d9949011bd7e39a71a86d48eb79 /java/src/com/android/inputmethod/annotations/UsedForTesting.java | |
| parent | ea23a2855757074197671cab4211c547a8f92f30 (diff) | |
| parent | 4ad92578dde88ad6442152c86dbfd8b107fbd550 (diff) | |
| download | latinime-41a2c10e72e02ce9215c867a67b87ecfcc725149.tar.gz latinime-41a2c10e72e02ce9215c867a67b87ecfcc725149.tar.xz latinime-41a2c10e72e02ce9215c867a67b87ecfcc725149.zip | |
resolved conflicts for merge of 4ad92578 to master
Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
Diffstat (limited to 'java/src/com/android/inputmethod/annotations/UsedForTesting.java')
0 files changed, 0 insertions, 0 deletions