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
..
jni	Merge remote-tracking branch 'goog/master' into mergescript	2012-07-05 16:53:56 +09:00
Android.mk	[MIPS] Remove reference to NDK	2012-01-31 12:08:27 -08:00