futokb/java
Satoshi Kataoka 6962a566f4 Resolve merge conflict
Change-Id: I96c87f7a4e4d34357d3d4c772eb3782c171bb4c0
2012-11-06 13:52:52 +09:00
..
res Add missing res dir 2012-11-06 13:49:17 +09:00
src/com/android/inputmethod Resolve merge conflict 2012-11-06 13:52:52 +09:00
Android.mk
AndroidManifest.xml Let's enhance 2012-10-12 14:19:40 -07:00
MODULE_LICENSE_APACHE2
NOTICE Add notice for Lexiteria dictionaries. 2012-10-05 11:08:31 +09:00
proguard.flags Add @UsedForTesting and @ExternallyReferenced annotations 2012-10-22 11:18:43 -07:00