nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 1633fa9b to master 

Change-Id: Ifa5d216091696b90ecc215ca4fd6110e79bbdf99
main
Dan Bornstein 2010-05-05 18:51:29 -07:00
parent dbab992963 1633fa9bfc
commit f53d0da540
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/Android.mk
View File

@ -11,8 +11,6 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) $(JNI_H_INCLUDE)
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := user LOCAL_MODULE_TAGS := user