Tadashi G. Takaoka 49cc3beb75 resolved conflicts for merge of 137667ed to master ... Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817		2011-11-18 08:51:39 -08:00
..
res	resolved conflicts for merge of 137667ed to master	2011-11-18 08:51:39 -08:00
src/com/android/inputmethod	resolved conflicts for merge of 137667ed to master	2011-11-18 08:51:39 -08:00
Android.mk	Use InputMethodSettingsFragment	2011-07-09 11:25:54 +09:00
AndroidManifest.xml	Remove unnecessary permission from open source LatinIME as well	2011-09-29 12:40:44 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Add a settings activity for the spell checker.	2011-08-12 19:07:51 +09:00