Kenny Root c4b93e8d90 Fix merge that should have been manually merged ... master was still using the deleted constants in different places and Java 6 didn't like the imports. Change-Id: If9472a2acb029e56790dc4d19ab62e608c970175		2010-10-10 17:15:21 -07:00
..
res	resolved conflicts for merge of 23d50bfb to master	2010-10-10 15:19:53 -07:00
src/com/android/inputmethod	Fix merge that should have been manually merged	2010-10-10 17:15:21 -07:00
Android.mk	Fix proguard flag file dependency.	2010-09-29 15:21:28 -07:00
AndroidManifest.xml	Add Debug Settings Activity	2010-09-27 14:07:10 +09:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags