Merge branch 'okHttpLinkedToken' of https://github.com/kepuss/open-keychain into kepuss-okHttpLinkedToken

2016-03-07 00:37:35 +01:00
parent 4a3cd716eb 852ccc3f8f
commit c419942a3f
5 changed files with 82 additions and 85 deletions
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -141,8 +141,6 @@ android {
    compileSdkVersion rootProject.ext.compileSdkVersion
    buildToolsVersion rootProject.ext.buildToolsVersion

-    // TODO: remove org.apache dependencies in LinkedTokenResource etc.
-    useLibrary 'org.apache.http.legacy'

    defaultConfig {
        minSdkVersion 15