futokb/java
satok a48d298d10 resolved conflicts for merge of b9c0ed59 to master
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
..
res resolved conflicts for merge of b9c0ed59 to master 2010-09-27 15:33:24 +09:00
src/com/android/inputmethod resolved conflicts for merge of b9c0ed59 to master 2010-09-27 15:33:24 +09:00
Android.mk Change all-subdir-java-files to all-java-files-under,src 2010-08-25 18:12:18 +09: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