satok e75e4463cd Merge remote-tracking branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml java/res/xml/prefs.xml Change-Id: I466a43c56ec01ddac2f8ae4f15dd3a7f8c21175d		2011-04-20 18:16:18 +09:00
..
data	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
res/raw	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00
src/com/android/inputmethod	Move language-specific keyboard setting to resources.	2011-04-20 17:31:59 +09:00
Android.mk	Merge remote branch 'goog/master' into merge	2011-03-25 15:17:08 -07:00
AndroidManifest.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00