LatinIME/java/src/com/android/inputmethod
satok 80a9ce76d8 Merge remote-tracking branch 'goog/master' into merge
Conflicts:
	java/res/xml/method.xml

Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd
2011-06-24 18:38:41 +09:00
..
accessibility Move Key class out of internal package 2011-06-23 22:59:12 +09:00
compat Merge remote-tracking branch 'goog/master' into merge 2011-06-24 18:38:41 +09:00
deprecated Merge "move setup wizard package name into google namespace" 2011-06-22 11:03:43 -07:00
keyboard Fix NPE with the unit test 2011-06-24 15:31:09 +09:00
latin Merge remote-tracking branch 'goog/master' into merge 2011-06-24 18:38:41 +09:00