satok b2d1967e1c Merge remote-tracking branch 'goog/master' into HEAD ... Conflicts: java/res/values/keyboard-icons-ics.xml Change-Id: I8b9b0758a81efd984cc9af52280ef75a807cd991		2011-06-27 22:47:11 +09:00
..
res	Merge remote-tracking branch 'goog/master' into HEAD	2011-06-27 22:47:11 +09:00
src/com/android/inputmethod	Merge remote-tracking branch 'goog/master' into HEAD	2011-06-27 22:47:11 +09:00
Android.mk	Fix lib and compat bugs.	2011-03-25 18:42:23 -07:00
AndroidManifest.xml	Add SuggestionSpan suggestion picked notification receiver	2011-05-26 19:47:29 +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	Add spell checking core methods.	2011-06-03 17:11:16 +09:00