satok b9c57e6540 Merge remote branch 'goog/master' ... Conflicts: java/res/xml/prefs.xml java/src/com/android/inputmethod/latin/BinaryDictionary.java java/src/com/android/inputmethod/latin/Dictionary.java java/src/com/android/inputmethod/latin/ExpandableDictionary.java java/src/com/android/inputmethod/latin/LatinIME.java java/src/com/android/inputmethod/latin/Suggest.java tests/src/com/android/inputmethod/latin/tests/SuggestTests.java		2010-07-16 13:02:45 +09:00
..
res	Merge remote branch 'goog/master'	2010-07-16 13:02:45 +09:00
src/com/android/inputmethod	Merge remote branch 'goog/master'	2010-07-16 13:02:45 +09:00
Android.mk	Merge remote branch 'goog/master'	2010-07-16 13:02:45 +09:00
AndroidManifest.xml	Change version	2010-07-02 17:37:41 +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	Tests and some new constructors to help in testing.	2010-05-07 13:40:20 -07:00