Tadashi G. Takaoka 841c295f3c resolved conflicts for merge of 5b048292 to master ...

Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835

2013-03-19 10:48:10 +09:00

..

res

Import translations. DO NOT MERGE

2013-03-18 13:28:15 -07:00

src/com/android/inputmethod

resolved conflicts for merge of 5b048292 to master

2013-03-19 10:48:10 +09:00

Android.mk

…

AndroidManifest.xml

Add setup wizard launcher icon

2013-03-01 22:28:00 +09:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…