satok d12def6dc8 Merge remote branch 'goog/master' into merge ... Conflicts: java/res/values-cs/strings.xml java/res/values-da/strings.xml java/res/values-de/strings.xml java/res/values-el/strings.xml java/res/values-es-rUS/strings.xml java/res/values-es/strings.xml java/res/values-fr/strings.xml java/res/values-it/strings.xml java/res/values-ja/strings.xml java/res/values-ko/strings.xml java/res/values-nb/strings.xml java/res/values-nl/strings.xml java/res/values-pl/strings.xml java/res/values-pt-rPT/strings.xml java/res/values-pt/strings.xml java/res/values-ru/strings.xml java/res/values-sv/strings.xml java/res/values-tr/strings.xml java/res/values-xlarge/dimens.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml java/res/values/bools.xml java/res/xml/kbd_qwerty_rows.xml java/res/xml/method.xml java/res/xml/prefs.xml Change-Id: I8768d16965e6e82c14ee742b9ada56438497eb86		2010-12-27 20:13:16 +09:00
..
dictionary.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
kbd_azerty_rows.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_key_styles.xml	Remove multi-tap feature	2010-12-20 21:58:31 +09:00
kbd_number.xml	Remove multi-tap feature	2010-12-20 21:58:31 +09:00
kbd_numkey_styles.xml	Remove multi-tap feature	2010-12-20 21:58:31 +09:00
kbd_phone.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_phone_symbols.xml	Remove multi-tap feature	2010-12-20 21:58:31 +09:00
kbd_popup_narrow_template.xml	Support keyboardHeight and maxKeyboardHeight to Keyboard XML	2010-12-08 17:43:29 +09:00
kbd_popup_template.xml	Support keyboardHeight and maxKeyboardHeight to Keyboard XML	2010-12-08 17:43:29 +09:00
kbd_qwerty.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwerty_black_symbol.xml	Remove multi-tap feature	2010-12-20 21:58:31 +09:00
kbd_qwerty_f1.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwerty_row1.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwerty_row2.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwerty_row3.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwerty_row4.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwerty_rows.xml	Support de,fr locale keyboard layouts for tablet	2010-12-01 10:17:16 +09:00
kbd_qwerty_rows_scandinavia.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_qwertz_rows.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_symbols.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_symbols_f1.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_symbols_row4.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_symbols_shift.xml	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
kbd_symbols_shift_row4.xml	Support <key-style/> and keyStyle attribute for Keyboard XML	2010-11-22 18:33:47 -08: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	Changed Icon for a US English keyboard subtype temporary	2010-12-16 16:58:00 +09:00
prefs.xml	Merge remote branch 'goog/master' into merge	2010-12-27 20:13:16 +09:00
prefs_for_debug.xml	Cleanup drawable-xlarge resources into drawable-mdpi	2010-11-19 01:37:38 -08:00