Merge remote-tracking branch 'origin/master' into wrapped-key-ring

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml

1 files changed, 0 insertions, 35 deletions

diff --git a/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle b/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle
deleted file mode 100644
index 69b937c1a..000000000
--- a/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-// please leave this here, so this library builds on its own
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.10.0'
-    }
-}
-
-apply plugin: 'android-library'
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
-    
-    // NOTE: We are using the old folder structure to also support Eclipse
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-    }
-    
-    // Do not abort build if lint finds errors
-    lintOptions {
-        abortOnError false
-    }
-}