satok a48d298d10 resolved conflicts for merge of b9c0ed59 to master ... Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d		2010-09-27 15:33:24 +09:00
..
dictionary.xml
kbd_phone_black.xml
kbd_phone_symbols_black.xml
kbd_phone_symbols.xml
kbd_phone.xml
kbd_popup_template.xml
kbd_qwerty_black.xml
kbd_qwerty.xml
kbd_symbols_black.xml
kbd_symbols_shift_black.xml
kbd_symbols_shift.xml
kbd_symbols.xml
language_prefs.xml
method.xml
popup_domains.xml
popup_punctuation.xml
popup_smileys.xml
prefs_for_debug.xml
prefs.xml	resolved conflicts for merge of b9c0ed59 to master	2010-09-27 15:33:24 +09:00