Ken Wakasa 8c15e91344 resolved conflicts for merge of d48d6fee to master ... Change-Id: I21141956135debe737453dba87617671b1716d0a		2012-12-15 09:44:39 +09:00
..
res	Import translations. DO NOT MERGE	2012-12-13 12:12:28 -08:00
src/com/android/inputmethod	resolved conflicts for merge of d48d6fee to master	2012-12-15 09:44:39 +09:00
Android.mk
AndroidManifest.xml	Remove backup agent from AOSP Android Keyboard	2012-11-12 12:37:25 +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