satok e5585c1854 Merge remote branch 'goog/master' into merge ... Conflicts: java/src/com/android/inputmethod/latin/BinaryDictionary.java java/src/com/android/inputmethod/latin/SubtypeSwitcher.java Change-Id: Ib2b4acc9dd570d5f37b6aa455e2f07b0a884944a		2011-01-14 13:45:21 +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	Load main dic in native	2011-01-07 19:51:45 +09:00
Android.mk	Cherry pick Change I04497fa0: Merge from the private sandbox to the froyo-ub-latinimegoogle	2010-08-27 15:54:02 +09:00
AndroidManifest.xml	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00