diff options
| author |   satok <satok@exia.tok.corp.google.com> | 2010-07-16 13:02:45 +0900 |
|---|---|---|
| committer | satok <satok@exia.tok.corp.google.com> | 2010-07-16 13:02:45 +0900 |
| commit | b9c57e6540502ef3b2941235bbbede4dedfdcfb7 (patch) | |
| tree | c8ccdc1455ab21eaef06c2b053ac7cada78de9f9 /java/Android.mk | |
| parent | b5a0d8ef42d9e0be4e56be04637c167074447744 (diff) | |
| parent | 2a118d844e0b7dd3e01f25e937b02b05711768a6 (diff) | |
| download | latinime-b9c57e6540502ef3b2941235bbbede4dedfdcfb7.tar.gz latinime-b9c57e6540502ef3b2941235bbbede4dedfdcfb7.tar.xz latinime-b9c57e6540502ef3b2941235bbbede4dedfdcfb7.zip | |
Merge remote branch 'goog/master'
Conflicts:
java/res/xml/prefs.xml
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/Dictionary.java
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Suggest.java
tests/src/com/android/inputmethod/latin/tests/SuggestTests.java
Diffstat (limited to 'java/Android.mk')
| -rwxr-xr-x | java/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk index a6dc49b2b..172f35a89 100755 --- a/java/Android.mk +++ b/java/Android.mk @@ -18,7 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common # com.google.android.inputmethod.latin in the LatinIME sandbox. LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin -LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := 8 LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags |