satok a48d298d10 resolved conflicts for merge of b9c0ed59 to master ...

Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d

2010-09-27 15:33:24 +09:00

..

dictionary.xml

DO NOT MERGE. Backport LatinIME from master to Gingerbread

2010-08-20 14:37:03 +09:00

kbd_phone_black.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_phone_symbols_black.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_phone_symbols.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_phone.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_popup_template.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

kbd_qwerty_black.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_qwerty.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_symbols_black.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_symbols_shift_black.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_symbols_shift.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

kbd_symbols.xml

Space key will no longer auto-repeat

2010-09-21 13:00:13 +09:00

language_prefs.xml

Don't let the native code target be included twice when unbundling.

2010-03-09 15:01:09 -08:00

method.xml

Add subtype to method.xml

2010-08-19 20:02:00 +09:00

popup_domains.xml

Cleanup keyboard layout files

2010-09-16 20:02:04 +09:00

popup_punctuation.xml

Cleanup keyboard layout files

2010-09-16 20:02:04 +09:00

popup_smileys.xml

Cleanup keyboard layout files

2010-09-16 20:02:04 +09:00

prefs_for_debug.xml

Add Debug Settings Activity

2010-09-27 14:07:10 +09:00

prefs.xml

resolved conflicts for merge of b9c0ed59 to master

2010-09-27 15:33:24 +09:00