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
..
res	Merge remote branch 'goog/master' into merge	2011-01-19 20:33:55 +09:00
src/com/android/inputmethod	Merge remote branch 'goog/master' into merge	2011-01-19 20:33:55 +09:00
Android.mk	Consolidate main dictionary files.	2011-01-05 11:31:58 +09:00
AndroidManifest.xml	Merge remote branch 'goog/master' into merge	2010-12-27 20:13:16 +09:00
MODULE_LICENSE_APACHE2	Clarify licensing	2010-04-05 09:47:36 -07:00
NOTICE	Clarify licensing	2010-04-05 09:47:36 -07:00
proguard.flags	Remove multi-tap feature	2010-12-20 21:58:31 +09:00