LatinIME/java/src/com/android/inputmethod
Satoshi Kataoka 3d2f5f8487 Merge remote-tracking branch 'goog/master' into mergescript
Conflicts:
	java/src/com/android/inputmethod/keyboard/Keyboard.java
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/Suggest.java

Change-Id: I73c1cec1f4bca5139372392e93d55081d814fa6c
2012-07-05 16:53:56 +09:00
..
accessibility Merge remote-tracking branch 'goog/master' into mergescript 2012-07-04 15:38:21 +09:00
compat Do not set "SuggestionSpan"s for suggestions from the next word predicition 2012-05-15 12:08:31 +09:00
keyboard Merge remote-tracking branch 'goog/master' into mergescript 2012-07-05 16:53:56 +09:00
latin Merge remote-tracking branch 'goog/master' into mergescript 2012-07-05 16:53:56 +09:00