diff options
| author |   Dan Bornstein <danfuzz@android.com> | 2010-05-05 18:51:29 -0700 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@android.com> | 2010-05-05 18:51:29 -0700 |
| commit | f53d0da540d4aca9c0b78938094e13a828ab1bd6 (patch) | |
| tree | 3adc74a2b50923d3ff649c3372fe0bc753668dc8 | |
| parent | dbab99296343f0359e2a59ec91e383701e185de2 (diff) | |
| parent | 1633fa9bfc80b20966995c52cd06b3023dcd3406 (diff) | |
| download | latinime-f53d0da540d4aca9c0b78938094e13a828ab1bd6.tar.gz latinime-f53d0da540d4aca9c0b78938094e13a828ab1bd6.tar.xz latinime-f53d0da540d4aca9c0b78938094e13a828ab1bd6.zip | |
resolved conflicts for merge of 1633fa9b to master
Change-Id: Ifa5d216091696b90ecc215ca4fd6110e79bbdf99
| -rw-r--r-- | native/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/native/Android.mk b/native/Android.mk index 952448435..0df74c702 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -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 |