Ken Wakasa e354a85ef4 Manual merge of the following Gingerbread changes logically ... I8b38e280 Ia3929bb0 If925b546 I1062763d I901e36aa bug: 3100311 Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2		2010-10-20 22:51:33 +09:00
..
res	Manual merge of the following Gingerbread changes logically	2010-10-20 22:51:33 +09:00
src/com/android/inputmethod	Manual merge of the following Gingerbread changes logically	2010-10-20 22:51:33 +09: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	Clarify licensing	2010-04-05 09:47:36 -07:00
NOTICE	Clarify licensing	2010-04-05 09:47:36 -07:00
proguard.flags	DO NOT MERGE. Backport LatinIME from master to Gingerbread	2010-08-20 14:37:03 +09:00