Jean Chalard 1b909c2846 Resolve conflicts for merge of 3a9ba17f to master" ... Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49		2012-11-13 16:34:23 +09:00
..
res	Use hexadecimal constants for subtypeId	2012-11-13 15:18:28 +09:00
src/com/android/inputmethod	Resolve conflicts for merge of 3a9ba17f to master"	2012-11-13 16:34:23 +09:00
Android.mk	Just a cosmetic cleanup	2012-07-28 21:24:29 +09:00
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