Ken Wakasa 4605ca8fdc Merge remote-tracking branch 'goog/master' into mergescriptpackage		2012-11-17 12:25:31 +09:00
..
res	am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev	2012-11-16 18:38:02 -08:00
src/com/android/inputmethod	resolved conflicts for merge of 4ad92578 to master	2012-11-17 11:33:48 +09:00
Android.mk
AndroidManifest.xml	Remove backup agent from AOSP Android Keyboard	2012-11-12 12:37:25 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Add @UsedForTesting and @ExternallyReferenced annotations	2012-10-22 11:18:43 -07:00