Marco Nelissen ea23a28557 resolved conflicts for merge of 6f42cf1d to master ... Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180		2012-11-16 11:23:33 -08:00
..
res	am 12c2e437: am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev	2012-11-16 10:36:12 -08:00
src/com/android/inputmethod	resolved conflicts for merge of 6f42cf1d to master	2012-11-16 11:23:33 -08:00
Android.mk	Just a cosmetic cleanup	2012-07-28 21:24:29 +09:00
AndroidManifest.xml	Remove backup agent from AOSP Android Keyboard	2012-11-12 12:37:25 +09:00
MODULE_LICENSE_APACHE2	…
NOTICE	Add notice for Lexiteria dictionaries.	2012-10-05 11:08:31 +09:00
proguard.flags	Add @UsedForTesting and @ExternallyReferenced annotations	2012-10-22 11:18:43 -07:00