Satoshi Kataoka 12bbd2cd5e Merge remote-tracking branch 'goog/master' into mergescript ... Conflicts: java/src/com/android/inputmethod/latin/SuggestedWords.java Change-Id: I1ce6cd0846cb93a5c9bb2d9c3638d59f90232c26		2012-07-04 19:21:16 +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-04 19:21:16 +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