Tadashi G. Takaoka b3861a41b5 resolved conflicts for merge of f73d2386 to master ...

Change-Id: I3f7d3cf35e5df888e397e61acc9786972a1fda4c

2011-01-26 00:49:20 +09:00

..

res

resolved conflicts for merge of f73d2386 to master

2011-01-26 00:49:20 +09:00

src/com/android/inputmethod

am e16e692f: am 3b46ae53: Merge "Automatically layout mini keyboard" into honeycomb

2011-01-25 07:37:54 -08:00

Android.mk

Consolidate main dictionary files.

2011-01-05 11:31:58 +09:00

AndroidManifest.xml

Remove LatinIME prefix from classes

2010-12-09 21:54:51 +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

Remove multi-tap feature

2010-12-20 21:58:31 +09:00