Skip to content
Snippets Groups Projects
Commit f53d0da5 authored by Dan Bornstein's avatar Dan Bornstein
Browse files

resolved conflicts for merge of 1633fa9b to master 

Change-Id: Ifa5d216091696b90ecc215ca4fd6110e79bbdf99
parents dbab9929 1633fa9b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 2 deletions
native/Android.mk
+ 0
− 2
View file @ f53d0da5
...@@ -11,8 +11,6 @@ LOCAL_SRC_FILES := \ ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment