Jean Chalard c0748a1990 Fix the build ... That was a merge not well resolved by git >.> Change-Id: I3cd042d6a5206daf1e9942358405d647c67423dd		2014-06-26 18:44:54 +09:00
..
res	Merge "Import translations. DO NOT MERGE"	2014-06-25 01:41:07 +00:00
src/com/android/inputmethod	Fix the build	2014-06-26 18:44:54 +09:00
Android.mk
AndroidManifest.xml	Reorganize Keyboard settings screen	2014-06-22 22:37:26 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags