diff options
| author |   Yohei Yukawa <yukawa@google.com> | 2014-09-18 18:26:06 +0900 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2014-09-18 18:27:45 +0900 |
| commit | eddfe51b38755e0068e3c322868c5e209f212f6f (patch) | |
| tree | 280fda5e51e269da433b9e3acccfa33025833481 /java/src/com/android/inputmethod/latin/InputAttributes.java | |
| parent | cdabc71c6da00ea1c2254e13021973c762c79be4 (diff) | |
| parent | 233a2f21c38a27049fa3b03af699593f629d1681 (diff) | |
| download | latinime-eddfe51b38755e0068e3c322868c5e209f212f6f.tar.gz latinime-eddfe51b38755e0068e3c322868c5e209f212f6f.tar.xz latinime-eddfe51b38755e0068e3c322868c5e209f212f6f.zip | |
resolved conflicts for merge of 233a2f21 to master
Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e
Diffstat (limited to 'java/src/com/android/inputmethod/latin/InputAttributes.java')
0 files changed, 0 insertions, 0 deletions