satok 80a9ce76d8 Merge remote-tracking branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd		2011-06-24 18:38:41 +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	Merge "Fix "Show settings key" option on 7" device"	2011-06-23 08:35:21 -07: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