satok a7ea6cad82 Merge remote branch 'goog/master' into merge ... Conflicts: java/res/xml/method.xml java/src/com/android/inputmethod/latin/LatinIME.java java/src/com/android/inputmethod/latin/SubtypeSwitcher.java java/src/com/android/inputmethod/voice/VoiceIMEConnector.java Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8		2011-02-10 17:31:37 +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 and rename computeProximityThreshold	2011-02-08 11:43:39 +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