summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-07-24 19:12:36 +0200
committerParménides GV <parmegv@sdf.org>2013-07-24 19:12:36 +0200
commit028a3fe74c52f59b3615907367a14a867f20b463 (patch)
treeb5afb3e5a50e29797d083b9b816d228133cf916c
parentaeee3b18b151c81ea67d1b540a97ce1ec887bf73 (diff)
parent58b96c50015aea4c46111f62a040b6a1a056ac0e (diff)
Merge branch 'hotfix/api-targets' into develop
-rw-r--r--AndroidManifest.xml6
-rw-r--r--project.properties2
2 files changed, 4 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9599747..f514b36 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -27,8 +27,8 @@
<!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
<uses-sdk
- android:minSdkVersion="15"
- android:targetSdkVersion="15" />
+ android:minSdkVersion="14"
+ android:targetSdkVersion="17" />
<permission
android:name="se.leap.openvpn.REMOTE_API"
@@ -163,4 +163,4 @@
</service>
</application>
-</manifest> \ No newline at end of file
+</manifest>
diff --git a/project.properties b/project.properties
index 895c9ce..c4f09d2 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-16
+target=android-17