Tadashi G. Takaoka 3b93f0e9a7 am 841c295f: resolved conflicts for merge of 5b048292 to master ... * commit '841c295f3c99214f45924434d9c0bb5b4760578d': Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS		2013-03-18 18:55:25 -07:00
..
res	Import translations. DO NOT MERGE	2013-03-18 13:28:15 -07:00
src/com/android/inputmethod	resolved conflicts for merge of 5b048292 to master	2013-03-19 10:48:10 +09:00
Android.mk	Just a cosmetic cleanup	2012-07-28 21:24:29 +09:00
AndroidManifest.xml	Add setup wizard launcher icon	2013-03-01 22:28:00 +09: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