Tadashi G. Takaoka 1dac5d491f resolved conflicts for merge of ac777128 to master ...

Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391

2010-10-16 04:57:53 +09:00

..

res

resolved conflicts for merge of ac777128 to master

2010-10-16 04:57:53 +09:00

src/com/android/inputmethod

resolved conflicts for merge of 21c3e696 to master

2010-10-14 15:36:50 -04: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