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
..
anim	Add enter/exit animation style to prevew and mini keyboard	2010-09-24 20:51:13 +09:00
drawable	Update suggestion strip drawables	2010-12-16 12:38:43 +09:00
drawable-hdpi	Implement CandidateView using HorizontalScrollView	2010-12-08 16:55:36 +09:00
drawable-land	Don't let the native code target be included twice when unbundling.	2010-03-09 15:01:09 -08:00
drawable-land-hdpi	Adding drawable-land-hdpi into LatinIME	2010-11-30 11:41:12 -08:00
drawable-land-mdpi	Integrating updated LatinIME keyboard assets	2010-12-10 16:19:50 -08:00
drawable-mdpi	Import new drawable assets	2010-12-24 11:26:26 +09:00
layout	Tune padding of candidate word	2010-12-13 17:46:11 +09:00
layout-xlarge	Update suggestion strip drawables	2010-12-16 12:38:43 +09:00
raw	Cleanup unused Java import	2010-11-29 17:57:48 +09:00
values	Merge remote branch 'goog/master' into merge	2010-12-27 20:13:16 +09:00
values-ar	Import revised translations.	2010-12-23 14:37:28 -08:00
values-bg	Import revised translations.	2010-12-23 14:37:28 -08:00
values-ca	Import revised translations.	2010-12-23 14:37:28 -08:00
values-cs	Import revised translations.	2010-12-23 14:37:28 -08:00
values-da	Import revised translations.	2010-12-23 14:37:28 -08:00
values-de	Import revised translations.	2010-12-23 14:37:28 -08:00
values-el	Import revised translations.	2010-12-23 14:37:28 -08:00
values-en	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
values-en-rGB	Import revised translations.	2010-12-23 14:37:28 -08:00
values-es	Import revised translations.	2010-12-23 14:37:28 -08:00
values-es-rUS	Import revised translations.	2010-12-23 14:37:28 -08:00
values-fa	Import revised translations.	2010-12-23 14:37:28 -08:00
values-fi	Import revised translations.	2010-12-23 14:37:28 -08:00
values-fr	Import revised translations.	2010-12-23 14:37:28 -08:00
values-fr-rCA	Cherry pick Change I04497fa0: Merge from the private sandbox to the froyo-ub-latinimegoogle	2010-08-27 15:54:02 +09:00
values-hr	Import revised translations.	2010-12-23 14:37:28 -08:00
values-hu	Import revised translations.	2010-12-23 14:37:28 -08:00
values-in	Import revised translations.	2010-12-23 14:37:28 -08:00
values-it	Import revised translations.	2010-12-23 14:37:28 -08:00
values-iw	Import revised translations.	2010-12-23 14:37:28 -08:00
values-ja	Import revised translations.	2010-12-23 14:37:28 -08:00
values-ko	Import revised translations.	2010-12-23 14:37:28 -08:00
values-land	Support keyboardHeight and maxKeyboardHeight to Keyboard XML	2010-12-08 17:43:29 +09:00
values-lt	Import revised translations.	2010-12-23 14:37:28 -08:00
values-lv	Import revised translations.	2010-12-23 14:37:28 -08:00
values-nb	Import revised translations.	2010-12-23 14:37:28 -08:00
values-nl	Import revised translations.	2010-12-23 14:37:28 -08:00
values-pl	Import revised translations.	2010-12-23 14:37:28 -08:00
values-pt	Import revised translations.	2010-12-23 14:37:28 -08:00
values-pt-rPT	Import revised translations.	2010-12-23 14:37:28 -08:00
values-rm	Import revised translations.	2010-12-23 14:37:28 -08:00
values-ro	Import revised translations.	2010-12-23 14:37:28 -08:00
values-ru	Import revised translations.	2010-12-23 14:37:28 -08:00
values-sk	Import revised translations.	2010-12-23 14:37:28 -08:00
values-sl	Import revised translations.	2010-12-23 14:37:28 -08:00
values-sr	Import revised translations.	2010-12-23 14:37:28 -08:00
values-sv	Import revised translations.	2010-12-23 14:37:28 -08:00
values-th	Import revised translations.	2010-12-23 14:37:28 -08:00
values-tl	Import revised translations.	2010-12-23 14:37:28 -08:00
values-tr	Import revised translations.	2010-12-23 14:37:28 -08:00
values-uk	Import revised translations.	2010-12-23 14:37:28 -08:00
values-vi	Import revised translations.	2010-12-23 14:37:28 -08:00
values-xlarge-land	Updated contrast in keys	2010-12-17 16:56:49 +09:00
values-zh-rCN	Import revised translations.	2010-12-23 14:37:28 -08:00
values-zh-rTW	Import revised translations.	2010-12-23 14:37:28 -08:00
xml	Merge remote branch 'goog/master' into merge	2010-12-27 20:13:16 +09:00
xml-da	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-da-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-de	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-de-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-fr	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-fr-rCA	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-fr-rCA-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-fr-rCH	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-fr-rCH-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-fr-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-iw	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-nb	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-nb-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-ru	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-ru-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-sr	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-sr-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-sv	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-sv-xlarge	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00
xml-xlarge	Import new drawable assets	2010-12-24 11:26:26 +09:00
xml-xlarge-land	Add popupKeyboardTemplate attribute to Keyboard	2010-12-17 17:18:28 +09:00