diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-29 09:55:13 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-29 09:55:13 +0200 |
| commit | c11c0c708bd73bcd3a2702adeefcc50a73998482 (patch) | |
| tree | 84b4d4a45ce8373d44905026aae423e2bc49e68c | |
| parent | 104fb7ef604b4085529c25de11367663ac84a82d (diff) | |
| parent | c8c12c38ca561ea5ccd8587f4136b2bf9713ffa4 (diff) | |
Merge branch 'feature/f-droid-verify-support-#6165' into develop0.9.4_FDROID
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | app/build.gradle | 2 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 8bd0f9d5..7c73874b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "ics-openvpn"] path = ics-openvpn branch = bitmask - url = git@github.com:parmegv/ics-openvpn.git + url = https://github.com/parmegv/ics-openvpn.git diff --git a/app/build.gradle b/app/build.gradle index 9acd5ab1..fbbc8eb8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "22.0.1" + buildToolsVersion "22.0.0" signingConfigs { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ce6d5ddd..b4ada5fc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,7 +23,8 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" + android:maxSdkVersion="18"/> <uses-sdk android:minSdkVersion="14" |