Merge branch 'klp-docs' into klp-modular-docs

Change-Id: If02b1d5be9d0568eaabb2800317866edf737c7e4

2 files changed, 1 insertions, 71 deletions

diff --git a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle b/background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle
deleted file mode 100644
index 2b4cc9db..00000000
--- a/background/alarms/RepeatingAlarm/RepeatingAlarmSample/build.gradle
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.8.+'
-    }
-}
-
-apply plugin: 'android'
-
-dependencies {
-<<<<<<< HEAD
-    // Add the support lib that is appropriate for SDK 4
-    compile "com.android.support:support-v4:19.0.+"
-=======
-
-  // Add the support lib that is appropriate for SDK 4
-    compile "com.android.support:support-v4:19.0.+"
-
-
->>>>>>> 16747963
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
-    'main',     // main sample code; look here for the interesting stuff.
-    'common',   // components that are reused by multiple samples
-    'template'] // boilerplate code that is generated by the sample template process
-
-android {
-    compileSdkVersion 19
-<<<<<<< HEAD
-=======
-
->>>>>>> 16747963
-    buildToolsVersion "19.0.1"
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-        instrumentTest.setRoot('tests')
-        instrumentTest.java.srcDirs = ['tests/src']
-    }
-}
-// BEGIN_EXCLUDE
-// Tasks below this line will be hidden from release output
-
-task preflight (dependsOn: parent.preflight) {
-    project.afterEvaluate {
-        // Inject a preflight task into each variant so we have a place to hook tasks
-        // that need to run before any of the android build tasks.
-        //
-        android.applicationVariants.each { variant ->
-            tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
-        }
-    }
-}
-
-// END_EXCLUDE
diff --git a/background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties b/background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
index 56f685a4..d7f03cfe 100644
--- a/background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
+++ b/background/alarms/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip