Baligh Uddin c363302eb7 Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp ... Conflicts: java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java Conflict resolved by matching code with jb-mr2-dev.		2013-05-15 11:40:41 -07:00
..
res	Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp	2013-05-15 11:40:41 -07:00
src/com/android/inputmethod	Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp	2013-05-15 11:40:41 -07:00
Android.mk
AndroidManifest.xml	Add permissions for personalization	2013-05-01 17:10:20 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags