diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-12-15 09:44:39 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-12-15 09:44:39 +0900 |
| commit | 8c15e91344a5e97ca069200070745c4384f40750 (patch) | |
| tree | 6015501e538a2865cf88c27fcc29d4511adbc3d6 /java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java | |
| parent | 39b5396f8e70eaac73d4c5eaa2bfede32a3f1f49 (diff) | |
| parent | d48d6feedd18f0fe334e8f167c5b0ff240a402ea (diff) | |
| download | latinime-8c15e91344a5e97ca069200070745c4384f40750.tar.gz latinime-8c15e91344a5e97ca069200070745c4384f40750.tar.xz latinime-8c15e91344a5e97ca069200070745c4384f40750.zip | |
resolved conflicts for merge of d48d6fee to master
Change-Id: I21141956135debe737453dba87617671b1716d0a
Diffstat (limited to 'java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java')
0 files changed, 0 insertions, 0 deletions