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
..
res	Merge remote-tracking branch 'goog/master' into mergescript	2012-07-04 15:38:21 +09:00
src/com/android/inputmethod	Merge remote-tracking branch 'goog/master' into mergescript	2012-07-05 16:53:56 +09:00
Android.mk	Added virtual view hierarchy for keyboard accessibility.	2012-02-28 10:01:40 -08:00
AndroidManifest.xml	Use splitActionBarWhenNarrow for Android Settings activity	2012-05-22 16:10:11 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Merge remote-tracking branch 'goog/master' into mergescript	2012-07-04 15:38:21 +09:00