resolved conflicts for merge of 1633fa9b
to master
Change-Id: Ifa5d216091696b90ecc215ca4fd6110e79bbdf99main
commit
f53d0da540
|
@ -11,8 +11,6 @@ LOCAL_SRC_FILES := \
|
|||
LOCAL_C_INCLUDES += \
|
||||
$(JNI_H_INCLUDE)
|
||||
|
||||
LOCAL_PRELINK_MODULE := false
|
||||
|
||||
LOCAL_MODULE := libjni_latinime
|
||||
|
||||
LOCAL_MODULE_TAGS := user
|
||||
|
|
Loading…
Reference in New Issue