Satoshi Kataoka 555e15a96a Merge remote-tracking branch 'goog/master' into mergescriptpackage ... Conflicts: java/res/values-ca/strings.xml java/res/values-cs/strings.xml java/res/values-de/strings.xml java/res/values-es/strings.xml java/res/values-hr/strings.xml java/res/values-hu/strings.xml java/res/values-it/strings.xml java/res/values-lv/strings.xml java/res/values-nb/strings.xml java/res/values-nl/strings.xml java/res/values-pl/strings.xml java/res/values-pt/strings.xml java/res/values-ro/strings.xml java/res/values-ru/strings.xml java/res/values-sv/strings.xml java/res/values-sw/strings.xml java/res/values-tr/strings.xml java/res/values-uk/strings.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml java/src/com/android/inputmethod/latin/RichInputConnection.java Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb		2012-11-06 12:49:53 +09:00
..
src/com/android/inputmethod	Merge remote-tracking branch 'goog/master' into mergescriptpackage	2012-11-06 12:49:53 +09:00
Android.mk	Just a cosmetic cleanup	2012-07-28 21:24:29 +09:00
AndroidManifest.xml	Let's enhance	2012-10-12 14:19:40 -07:00
MODULE_LICENSE_APACHE2	…
NOTICE	Add notice for Lexiteria dictionaries.	2012-10-05 11:08:31 +09:00
proguard.flags	Add @UsedForTesting and @ExternallyReferenced annotations	2012-10-22 11:18:43 -07:00