satok 9c383385d5 Merge remote branch 'goog/master' into merge ... Conflicts: java/src/com/android/inputmethod/latin/Settings.java java/src/com/android/inputmethod/latin/SubtypeSwitcher.java java/src/com/android/inputmethod/voice/VoiceIMEConnector.java Change-Id: If30410c4814c3224f87698c165312494c0efca23		2011-01-19 20:33:55 +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	Add unit test for SubtypeLocale	2011-01-17 13:46:44 +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