Remove the build directory from samples/common

Removing the build directory from samples/common in favor of platform/developers/build.

Change-Id: I0f4fbba61669434fc441ffe3575e31f26c17ce15
diff --git a/background/alarms/repeatingAlarm/build.gradle b/background/alarms/repeatingAlarm/build.gradle
index 15500fb..dbe554d 100644
--- a/background/alarms/repeatingAlarm/build.gradle
+++ b/background/alarms/repeatingAlarm/build.gradle
@@ -1,5 +1,5 @@
 // BEGIN_EXCLUDE
-apply from: "../../../common/build/build.gradle"
+apply from: "../../../../../build/build.gradle"
 samplegen {
 pathToSamplesCommon "../../../common"
 }
diff --git a/background/alarms/repeatingAlarm/buildSrc/build.gradle b/background/alarms/repeatingAlarm/buildSrc/build.gradle
index b2978f5..8c294c2 100644
--- a/background/alarms/repeatingAlarm/buildSrc/build.gradle
+++ b/background/alarms/repeatingAlarm/buildSrc/build.gradle
@@ -8,7 +8,7 @@
 sourceSets {
     main {
         groovy {
-            srcDir new File(rootDir, "../../../common/build/buildSrc/src/main/groovy")
+            srcDir new File(rootDir, "../../../../../build/buildSrc/src/main/groovy")
         }
     }
 }
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..602c3fd
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,46 @@
+List<String> samples = [ 
+    "connectivity/bluetooth/BluetoothLeGatt",
+//    "connectivity/sync/BasicSyncAdapter",
+    "connectivity/network/BasicNetworkDemo",
+    "connectivity/network/NetworkConnect",
+    "content/multiuser/AppRestrictions",
+    "content/contacts/BasicContactables",
+    "sampleSamples/BaseSample",
+    "sampleSamples/foo",
+    "sampleSamples/singleViewSample",
+    "sampleSamples/ActivityCards",
+    "ui/notifications/CustomNotifications",
+    "ui/notifications/BasicNotifications",
+//    "ui/ImmersiveMode",
+    "ui/actionbarcompat/ListPopupMenu",
+    "ui/actionbarcompat/Styled",
+    "ui/actionbarcompat/ShareActionProvider",
+    "ui/actionbarcompat/Basic",
+    "ui/actionbar/DoneBar",
+    "ui/accessibility/BasicAccessibility",
+    "ui/lists/CustomChoiceList",
+    "ui/views/TextSwitcher",
+    "ui/views/HorizontalPaging",
+    "ui/holo/BorderlessButtons",
+    "security/keystore/BasicAndroidKeyStore",
+    "views/TextLinkify",
+//    "background/alarms/repeatingAlarm",
+    "media/BasicMediaRouter",
+//    "media/BasicMediaDecoder",
+//    "media/MediaRecorder",
+    "input/multitouch/BasicMultitouch",
+    "input/gestures/BasicGestureDetect",
+]
+
+task build {}
+
+samples.each { sample ->
+    File sampleDir = new File(sample)
+    buildSample = project.task([type: GradleBuild], sample, {
+        buildFile = "${sample}/build.gradle"
+        dir = sample
+        tasks = ["build"]
+    })  
+    build.dependsOn(buildSample)
+}
+
diff --git a/sampleSamples/BaseSample/buildSrc/build.gradle b/buildSrc/build.gradle
similarity index 64%
rename from sampleSamples/BaseSample/buildSrc/build.gradle
rename to buildSrc/build.gradle
index b2978f5..b42a6ef 100644
--- a/sampleSamples/BaseSample/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -8,7 +8,7 @@
 sourceSets {
     main {
         groovy {
-            srcDir new File(rootDir, "../../../common/build/buildSrc/src/main/groovy")
+            srcDir new File(rootDir, "../../build/buildSrc/src/main/groovy")
         }
     }
 }
diff --git a/common/build/build.gradle b/common/build/build.gradle
deleted file mode 100644
index 45ff0a1..0000000
--- a/common/build/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-* Copyright 2013 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-// The SampleGenPlugin source is in the buildSrc directory.
-import com.example.android.samples.build.SampleGenPlugin
-apply plugin: SampleGenPlugin
-
-// Add a preflight task that depends on the "refresh" task that gets
-// added by the SampleGenPlugin.
-task preflight {
-    project.afterEvaluate({preflight.dependsOn(project.refresh)})
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '1.6'
-}
\ No newline at end of file
diff --git a/common/build/build.iml b/common/build/build.iml
deleted file mode 100644
index 2edbb2b..0000000
--- a/common/build/build.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$USER_HOME$/src/android/developers-dev/developers/samples/android/common/build" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/common/build/buildSrc/build.gradle b/common/build/buildSrc/build.gradle
deleted file mode 100644
index 7ac6c8f..0000000
--- a/common/build/buildSrc/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-apply plugin: 'groovy'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile 'org.freemarker:freemarker:2.3.20'
-    compile gradleApi()
-    compile localGroovy()
-}
diff --git a/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/ApplyTemplates.groovy b/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/ApplyTemplates.groovy
deleted file mode 100644
index 8864ce2..0000000
--- a/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/ApplyTemplates.groovy
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.example.android.samples.build
-
-import freemarker.cache.FileTemplateLoader
-import freemarker.cache.MultiTemplateLoader
-import freemarker.cache.TemplateLoader
-import freemarker.template.Configuration
-import freemarker.template.DefaultObjectWrapper
-import freemarker.template.Template
-import org.gradle.api.GradleException
-import org.gradle.api.file.FileVisitDetails
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.SourceTask
-import org.gradle.api.tasks.TaskAction
-
-
-class ApplyTemplates extends SourceTask {
-    /**
-     * Freemarker context object
-     */
-    def Configuration cfg = new freemarker.template.Configuration()
-
-    /**
-     * The root directory for output files. All output file paths
-     * are assumed to be relative to this root.
-     */
-    @OutputDirectory
-    public outputDir = project.projectDir
-
-    /**
-     * Include directory. The templates in this directory will not be
-     * processed directly, but will be accessible to other templates
-     * via the <#include> directive.
-     */
-    def include = project.file("$project.projectDir/templates/include")
-
-    /**
-     * List of file extensions that indicate a file to be processed, rather
-     * than simply copied.
-     */
-    def extensionsToProcess = ['ftl']
-
-    /**
-     * List of file extensions that should be completely ignored by this
-     * task. File extensions that appear in neither this list nor the list
-     * specified by {@link #extensionsToProcess} are copied into the destination
-     * without processing.
-     */
-    def extensionsToIgnore = ['ftli']
-
-    /**
-     * A String -> String closure that transforms a (relative) input path into a
-     * (relative) output path. This closure is responsible for any alterations to
-     * the output path, including pathname substitution and extension removal.
-     */
-    Closure<String> filenameTransform
-
-    /**
-     * The hash which will be passed to the freemarker template engine. This hash
-     * is used by the freemarker script as input data.
-     * The hash should contain a key named "meta". The template processor will add
-     * processing data to this key.
-     */
-    def parameters
-
-    /**
-     * The main action for this task. Visits each file in the source directories and
-     * either processes, copies, or ignores it. The action taken for each file depends
-     * on the contents of {@link #extensionsToProcess} and {@link #extensionsToIgnore}.
-     */
-    @TaskAction
-    def applyTemplate() {
-        // Create a list of Freemarker template loaders based on the
-        // source tree(s) of this task. The loader list establishes a virtual
-        // file system for freemarker templates; the template language can
-        // load files, and each load request will have its path resolved
-        // against this set of loaders.
-        println "Gathering template load locations:"
-        def List loaders = []
-        source.asFileTrees.each {
-            src ->
-                println "    ${src.dir}"
-                loaders.add(0, new FileTemplateLoader(project.file(src.dir)))
-        }
-
-        // Add the include path(s) to the list of loaders.
-        println "Gathering template include locations:"
-        include = project.fileTree(include)
-        include.asFileTrees.each {
-            inc ->
-                println "    ${inc.dir}"
-                loaders.add(0, new FileTemplateLoader(project.file(inc.dir)))
-        }
-        // Add the loaders to the freemarker config
-        cfg.setTemplateLoader(new MultiTemplateLoader(loaders.toArray(new TemplateLoader[1])))
-
-        // Set the wrapper that will be used to convert the template parameters hash into
-        // the internal freemarker data model. The default wrapper is capable of handling a
-        // mix of POJOs/POGOs and XML nodes, so we'll use that.
-        cfg.setObjectWrapper(new DefaultObjectWrapper())
-
-        // This is very much like setting the target SDK level in Android.
-        cfg.setIncompatibleEnhancements("2.3.20")
-
-        // Add an implicit <#include 'common.ftl' to the top of every file.
-        // TODO: should probably be a parameter instead of hardcoded like this.
-        cfg.addAutoInclude('common.ftl')
-
-        // Visit every file in the source tree(s)
-        def processTree = source.getAsFileTree()
-        processTree.visit {
-            FileVisitDetails input ->
-                def inputFile = input.getRelativePath().toString()
-                def outputFile = input.getRelativePath().getFile(project.file(outputDir))
-                // Get the input and output files, and make sure the output path exists
-                def renamedOutput = filenameTransform(outputFile.toString())
-                outputFile = project.file(renamedOutput)
-
-                if (input.directory){
-                    // create the output directory. This probably will have already been
-                    // created as part of processing the files *in* the directory, but
-                    // do it here anyway to support empty directories.
-                    outputFile.mkdirs()
-                } else {
-                    // We may or may not see the directory before we see the files
-                    // in that directory, so create it here
-                    outputFile.parentFile.mkdirs()
-
-                    // Check the input file extension against the process/ignore list
-                    def extension = "NONE"
-                    def extensionPattern = ~/.*\.(\w*)$/
-                    def extensionMatch = extensionPattern.matcher(inputFile)
-                    if (extensionMatch.matches()) {
-                        extension = extensionMatch[0][1]
-                    }
-                    // If the extension is in the process list, put the input through freemarker
-                    if (extensionsToProcess.contains(extension)){
-                        print '[freemarker] PROCESS: '
-                        println "$inputFile -> $outputFile"
-
-                        try {
-                            def Template tpl = this.cfg.getTemplate(inputFile)
-                            def FileWriter out = new FileWriter(outputFile)
-
-                            // Add the output file path to parameters.meta so that the freemarker
-                            // script can access it.
-                            parameters.meta.put("outputFile", "${outputFile}")
-                            tpl.process(parameters, out)
-                        } catch (e) {
-                            println e.message
-                            throw new GradleException("Error processing ${inputFile}: ${e.message}")
-                        }
-                    } else if (!extensionsToIgnore.contains(extension)) {
-                        // if it's not processed and not ignored, then it must be copied.
-                        print '[freemarker] COPY: '
-                        println "$inputFile -> $outputFile"
-                        input.copyTo(outputFile);
-                    }
-                }
-        }
-    }
-}
diff --git a/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy b/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy
deleted file mode 100644
index 64aea54..0000000
--- a/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.example.android.samples.build
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.tasks.GradleBuild
-/**
- * Created by ilewis on 7/3/13.
- */
-class SampleGenPlugin implements Plugin {
-
-    /**
-     * Creates a new sample generator task based on the supplied sources.
-     *
-     * @param name Name of the new task
-     * @param sources Source tree that this task should process
-     */
-    void createTask(Project project, String name, SampleGenProperties props, def sources, def destination) {
-        project.task ([type:ApplyTemplates], name,  {
-            sources.each { tree ->
-                source += tree
-            }
-            outputDir = destination
-            include = props.templatesInclude()
-            filenameTransform = {s -> props.getOutputForInput(s)}
-            parameters = props.templateParams()
-        })
-    }
-
-    @Override
-    void apply(project) {
-        project.extensions.create("samplegen", SampleGenProperties)
-        project.samplegen.project = project
-        project.afterEvaluate({
-            SampleGenProperties samplegen = project.samplegen
-            project.task('create') {
-                if (project.gradle.startParameter.taskNames.contains('create')) {
-                    samplegen.getCreationProperties()
-                }
-
-            }
-
-            project.task('refresh') {
-                samplegen.getRefreshProperties()
-            }
-
-            createTask(project, 'processTemplates', samplegen, samplegen.templates(), samplegen.targetProjectDir)
-            createTask(project, 'processCommon', samplegen, samplegen.common(), samplegen.targetCommonSourceDir())
-
-
-            project.task([type: GradleBuild], 'bootstrap', {
-                buildFile = "${samplegen.targetProjectDir}/build.gradle"
-                dir = samplegen.targetProjectDir
-                tasks = ["refresh"]
-            })
-            project.bootstrap.dependsOn(project.processTemplates)
-            project.bootstrap.dependsOn(project.processCommon)
-            project.create.dependsOn(project.bootstrap)
-
-            project.refresh.dependsOn(project.processTemplates)
-            project.refresh.dependsOn(project.processCommon)
-
-            // People get nervous when they see a task with no actions, so...
-            project.create << {println "Project creation finished."}
-            project.refresh << {println "Project refresh finished."}
-        })
-    }
-
-
-}
\ No newline at end of file
diff --git a/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenProperties.groovy b/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenProperties.groovy
deleted file mode 100644
index 86660cb..0000000
--- a/common/build/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenProperties.groovy
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.example.android.samples.build
-
-import freemarker.ext.dom.NodeModel
-import groovy.transform.Canonical
-import org.gradle.api.GradleException
-import org.gradle.api.Project
-import org.gradle.api.file.FileTree
-
-/**
- * Gradle extension that holds properties for sample generation.
- *
- * The sample generator needs a number of properties whose values can be
- * inferred by convention from a smaller number of initial properties.
- * This class defines fields for the initial properties, and getter
- * methods for the inferred properties. It also defines a small number
- * of convenience methods for setting up template-generation tasks.
- */
-@Canonical
-class SampleGenProperties {
-    /**
-     * The Gradle project that this extension is being applied to.
-     */
-    Project project
-
-    /**
-     *  Directory where the top-level sample project lives
-     */
-    def targetProjectDir
-
-    /**
-     * Relative path to samples/common directory
-     */
-    def pathToSamplesCommon
-
-    /**
-     * Java package name for the root package of this sample.
-     */
-     String targetSamplePackage
-
-
-    String targetCommonSourceDir() {
-        return "${targetProjectDir}/${targetSampleModule()}/src/common/java/com/example/android/common"
-    }
-
-    /**
-     * The name of this sample (and also of the corresponding .iml file)
-     */
-    String targetSampleName() {
-        return project.file(targetProjectDir).getName()
-    }
-
-    /**
-     * The name of the main module in the sample project
-     */
-    String targetSampleModule() {
-        return "${targetSampleName()}Sample"
-    }
-
-    /**
-     * The path to the template parameters file
-     */
-    String templateXml() {
-        return "${targetProjectDir}/template-params.xml"
-    }
-
-    /**
-     * Returns the sample's fully qualified Java package as an OS dependent
-     * path fragment
-     */
-    String targetSamplePackageAsPath() {
-        return targetSamplePackage.replaceAll(/\./, File.separator)
-    }
-
-    /**
-     * Returns the path to the common/build/templates directory
-     */
-    String templatesRoot() {
-        return "${pathToSamplesCommon}/build/templates"
-    }
-
-
-    /**
-     * Returns the path to common/src/java
-     */
-    String commonSourceRoot() {
-        return "${pathToSamplesCommon}/src/java/com/example/android/common"
-    }
-
-    /**
-     * Returns the path to the template include directory
-     */
-    String templatesInclude() {
-        return "${templatesRoot()}/include"
-    }
-
-    /**
-     * Returns the output file that will be generated for a particular
-     * input, by replacing generic pathnames with project-specific pathnames
-     * and dropping the .ftl extension from freemarker files.
-     *
-     * @param relativeInputPath Input file as a relative path from the template directory
-     * @return Relative output file path
-     */
-    String getOutputForInput(String relativeInputPath) {
-        String outputPath = relativeInputPath
-        outputPath = outputPath.replaceAll('_PROJECT_', targetSampleName())
-        outputPath = outputPath.replaceAll('_MODULE_', targetSampleModule())
-        outputPath = outputPath.replaceAll('_PACKAGE_', targetSamplePackageAsPath())
-
-        // This is kind of a hack; IntelliJ picks up any and all subdirectories named .idea, so
-        // named them ._IDE_ instead. TODO: remove when generating .idea projects is no longer necessary.
-        outputPath = outputPath.replaceAll('_IDE_', "idea")
-        outputPath = outputPath.replaceAll(/\.ftl$/, '')
-
-        // Any file beginning with a dot won't get picked up, so rename them as necessary here.
-        outputPath = outputPath.replaceAll('gitignore', '.gitignore')
-        return outputPath
-    }
-
-    /**
-     * Returns the tree(s) where the templates to be processed live. The template
-     * input paths that are passed to
-     * {@link SampleGenProperties#getOutputForInput(java.lang.String) getOutputForInput}
-     * are relative to the dir element in each tree.
-     */
-    FileTree[] templates() {
-        def result = []
-        def xmlFile = project.file(templateXml())
-        if (xmlFile.exists()) {
-            def xml = new XmlSlurper().parse(xmlFile)
-            xml.template.each { template ->
-                result.add(project.fileTree(dir: "${templatesRoot()}/${template.@src}"))
-            }
-        } else {
-            result.add(project.fileTree(dir: "${templatesRoot()}/create"))
-        }
-        return result;
-    }
-
-    /**
-     * Path(s) of the common directories to copy over to the sample project.
-     */
-    FileTree[] common() {
-        def result = []
-        def xmlFile = project.file(templateXml())
-        if (xmlFile.exists()) {
-            def xml = new XmlSlurper().parse(xmlFile)
-            xml.common.each { common ->
-                println "Adding common/${common.@src} from ${commonSourceRoot()}"
-                result.add(project.fileTree (
-                        dir: "${commonSourceRoot()}",
-                        include: "${common.@src}/**/*"
-                ))
-            }
-        }
-        return result
-    }
-
-    /**
-     * Returns the hash to supply to the freemarker template processor.
-     * This is loaded from the file specified by {@link SampleGenProperties#templateXml()}
-     * if such a file exists, or synthesized with some default parameters if it does not.
-     * In addition, some data about the current project is added to the "meta" key of the
-     * hash.
-     *
-     * @return The hash to supply to freemarker
-     */
-    Map templateParams() {
-        Map result = new HashMap();
-
-        def xmlFile = project.file(templateXml())
-        if (xmlFile.exists()) {
-            // Parse the xml into Freemarker's DOM structure
-            def params = freemarker.ext.dom.NodeModel.parse(xmlFile)
-
-            // Move to the <sample> node and stuff that in our map
-            def sampleNode = (NodeModel)params.exec(['/sample'])
-            result.put("sample", sampleNode)
-        } else {
-            // Fake data for use on creation
-            result.put("sample", [
-                    name:targetSampleName(),
-                    package:targetSamplePackage,
-                    minSdk:4
-            ])
-        }
-
-        // Extra data that some templates find useful
-        result.put("meta", [
-                root: targetProjectDir,
-                module: targetSampleModule(),
-                common: pathToSamplesCommon,
-        ])
-        return result
-    }
-
-
-
-    /**
-     * Generate default values for properties that can be inferred from an existing
-     * generated project, unless those properties have already been
-     * explicitly specified.
-     */
-    void getRefreshProperties() {
-        if (!this.targetProjectDir) {
-            this.targetProjectDir = project.projectDir
-        }
-        def xmlFile = project.file(templateXml())
-        if (xmlFile.exists()) {
-            println "Template XML: $xmlFile"
-            def xml = new XmlSlurper().parse(xmlFile)
-            this.targetSamplePackage = xml.package.toString()
-            println "Target Package: $targetSamplePackage"
-        }
-    }
-
-    /**
-     * Generate default values for creation properties, unless those properties
-     * have already been explicitly specified. This method will attempt to get
-     * these properties interactively from the user if necessary.
-     */
-    void getCreationProperties() {
-        def calledFrom = project.hasProperty('calledFrom') ? new File(project.calledFrom)
-                : project.projectDir
-        calledFrom = calledFrom.getCanonicalPath()
-        println('\n\n\nReady to create project...')
-
-        if (!this.pathToSamplesCommonSet) {
-            if (project.hasProperty('pathToSamplesCommon')) {
-                this.pathToSamplesCommon = project.pathToSamplesCommon
-            } else {
-                throw new GradleException ('create task requires project property pathToSamplesCommon')
-            }
-        }
-
-        if (!this.targetProjectDir) {
-            if (project.hasProperty('out')) {
-                this.targetProjectDir = project.out
-            } else {
-                this.targetProjectDir  = System.console().readLine("\noutput directory [$calledFrom]:")
-                if (this.targetProjectDir.length() <= 0) {
-                    this.targetProjectDir = calledFrom
-                }
-            }
-        }
-
-        if (!this.targetSamplePackage) {
-            def defaultPackage = "com.example.android." + this.targetSampleName().toLowerCase()
-            this.targetSamplePackage = System.console().readLine("\nsample package name[$defaultPackage]:")
-            if (this.targetSamplePackage.length() <= 0) {
-                this.targetSamplePackage = defaultPackage
-            }
-        }
-    }
-
-}
diff --git a/common/build/buildSrc/src/main/main.iml b/common/build/buildSrc/src/main/main.iml
deleted file mode 100644
index 4faa95b..0000000
--- a/common/build/buildSrc/src/main/main.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/groovy" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/common/build/gradle/wrapper/gradle-wrapper.jar b/common/build/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index a7634b0..0000000
--- a/common/build/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/common/build/gradle/wrapper/gradle-wrapper.properties b/common/build/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index adbf9fe..0000000
--- a/common/build/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Jul 03 16:40:03 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/common/build/gradlew b/common/build/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/common/build/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/common/build/gradlew.bat b/common/build/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/common/build/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off

-@rem ##########################################################################

-@rem

-@rem  Gradle startup script for Windows

-@rem

-@rem ##########################################################################

-

-@rem Set local scope for the variables with windows NT shell

-if "%OS%"=="Windows_NT" setlocal

-

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

-set DEFAULT_JVM_OPTS=

-

-set DIRNAME=%~dp0

-if "%DIRNAME%" == "" set DIRNAME=.

-set APP_BASE_NAME=%~n0

-set APP_HOME=%DIRNAME%

-

-@rem Find java.exe

-if defined JAVA_HOME goto findJavaFromJavaHome

-

-set JAVA_EXE=java.exe

-%JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

-

-echo.

-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:findJavaFromJavaHome

-set JAVA_HOME=%JAVA_HOME:"=%

-set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-

-if exist "%JAVA_EXE%" goto init

-

-echo.

-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:init

-@rem Get command-line arguments, handling Windowz variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_args

-if "%@eval[2+2]" == "4" goto 4NT_args

-

-:win9xME_args

-@rem Slurp the command line arguments.

-set CMD_LINE_ARGS=

-set _SKIP=2

-

-:win9xME_args_slurp

-if "x%~1" == "x" goto execute

-

-set CMD_LINE_ARGS=%*

-goto execute

-

-:4NT_args

-@rem Get arguments from the 4NT Shell from JP Software

-set CMD_LINE_ARGS=%$

-

-:execute

-@rem Setup the command line

-

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-

-@rem Execute Gradle

-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

-

-:end

-@rem End local scope for the variables with windows NT shell

-if "%ERRORLEVEL%"=="0" goto mainEnd

-

-:fail

-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

-rem the _cmd.exe /c_ return code!

-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

-exit /b 1

-

-:mainEnd

-if "%OS%"=="Windows_NT" endlocal

-

-:omega

diff --git a/common/build/lib/assetstudio.jar b/common/build/lib/assetstudio.jar
deleted file mode 100644
index 0893a22..0000000
--- a/common/build/lib/assetstudio.jar
+++ /dev/null
Binary files differ
diff --git a/common/build/lib/buildSrc.jar b/common/build/lib/buildSrc.jar
deleted file mode 100644
index 9c56bc1..0000000
--- a/common/build/lib/buildSrc.jar
+++ /dev/null
Binary files differ
diff --git a/common/build/sample-create b/common/build/sample-create
deleted file mode 100755
index df642d3..0000000
--- a/common/build/sample-create
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-CALLED_FROM=$( pwd -P )
-SCRIPTNAME=$(basename "$0")
-SCRIPTPATH=$( cd "$(dirname "$0")" ; pwd -P )
-GRADLE=$SCRIPTPATH/gradlew
-
-SAMPLE_PATH=""
-
-if  [ -n "$1" ]; then
-    SAMPLE_PATH=$CALLED_FROM/$1
-fi
-
-SAMPLES_COMMON=$( cd "$SCRIPTPATH/.." ; pwd -P )
-
-SAMPLES_COMMON=$(perl -e "use File::Spec; print File::Spec->abs2rel(@ARGV)" $SAMPLES_COMMON $SAMPLE_PATH)
-
-$GRADLE -b $SCRIPTPATH/build.gradle --info create -Pout=$SAMPLE_PATH -PcalledFrom=$CALLED_FROM -PpathToSamplesCommon=$SAMPLES_COMMON
diff --git a/common/build/settings.gradle b/common/build/settings.gradle
deleted file mode 100644
index 8b13789..0000000
--- a/common/build/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/common/build/templates/ActivityCards/ActivityCardsCommon.ftli b/common/build/templates/ActivityCards/ActivityCardsCommon.ftli
deleted file mode 100644
index 7ed2d5d..0000000
--- a/common/build/templates/ActivityCards/ActivityCardsCommon.ftli
+++ /dev/null
@@ -1 +0,0 @@
-<#macro make_activity_res activity type>${(activity.class!"activity_class")?lower_case}_${type}</#macro>
\ No newline at end of file
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/java/_PACKAGE_/MainActivity.java.ftl b/common/build/templates/ActivityCards/_MODULE_/src/template/java/_PACKAGE_/MainActivity.java.ftl
deleted file mode 100755
index 25bc836..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/java/_PACKAGE_/MainActivity.java.ftl
+++ /dev/null
@@ -1,123 +0,0 @@
-<#ftl>
-<#include "/ActivityCardsCommon.ftli">
-<#--
-        Copyright 2013 The Android Open Source Project
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
--->
-
-package ${sample.package};
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.TextView;
-
-/**
- * A simple launcher activity offering access to the individual samples in this project.
- */
-public class MainActivity extends Activity implements AdapterView.OnItemClickListener {
-    private Sample[] mSamples;
-    private GridView mGridView;
-
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        // Prepare list of samples in this dashboard.
-        <#if (sample.activity?size > 0)>
-        mSamples = new Sample[]{
-            <#list sample.activity as activity>
-            new Sample(R.string.<@make_activity_res activity "title"/>, R.string.<@make_activity_res activity "description"/>,
-                    ${activity.class}.class),
-            </#list>
-        };
-        <#else>
-        /* TODO: Define at least one <activity> tag in template-params.xml like so:
-            <activity>
-                <class>[Java class that implements the activity]</class>
-                <title>[Title bar text]</title>
-                <description>[One or two sentence description of what this activity does]</description>
-            </activity>
-         Once activity tags are defined, this text will disappear and be replaced by code
-         that adds your activities to the grid of cards.
-        */
-        </#if>
-
-        // Prepare the GridView
-        mGridView = (GridView) findViewById(android.R.id.list);
-        mGridView.setAdapter(new SampleAdapter());
-        mGridView.setOnItemClickListener(this);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> container, View view, int position, long id) {
-        startActivity(mSamples[position].intent);
-    }
-
-    private class SampleAdapter extends BaseAdapter {
-        @Override
-        public int getCount() {
-            return mSamples.length;
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mSamples[position];
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return mSamples[position].hashCode();
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup container) {
-            if (convertView == null) {
-                convertView = getLayoutInflater().inflate(R.layout.sample_dashboard_item,
-                        container, false);
-            }
-
-            ((TextView) convertView.findViewById(android.R.id.text1)).setText(
-                    mSamples[position].titleResId);
-            ((TextView) convertView.findViewById(android.R.id.text2)).setText(
-                    mSamples[position].descriptionResId);
-            return convertView;
-        }
-    }
-
-    private class Sample {
-        int titleResId;
-        int descriptionResId;
-        Intent intent;
-
-        private Sample(int titleResId, int descriptionResId, Intent intent) {
-            this.intent = intent;
-            this.titleResId = titleResId;
-            this.descriptionResId = descriptionResId;
-        }
-
-        private Sample(int titleResId, int descriptionResId,
-                Class<? extends Activity> activityClass) {
-            this(titleResId, descriptionResId,
-                    new Intent(MainActivity.this, activityClass));
-        }
-    }
-}
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-hdpi/ic_launcher.png b/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b1efaf4..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-mdpi/ic_launcher.png b/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f5f9244..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xhdpi/ic_launcher.png b/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d07b3f..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xhdpi/sample_dashboard_item_background.9.png b/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xhdpi/sample_dashboard_item_background.9.png
deleted file mode 100644
index 1358628..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xhdpi/sample_dashboard_item_background.9.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xxhdpi/ic_launcher.png b/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6ef21e1..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/layout/activity_main.xml b/common/build/templates/ActivityCards/_MODULE_/src/template/res/layout/activity_main.xml
deleted file mode 100755
index 88cdb80..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/layout/activity_main.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView style="@style/Widget.SampleMessage"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/horizontal_page_margin"
-        android:layout_marginRight="@dimen/horizontal_page_margin"
-        android:layout_marginTop="@dimen/vertical_page_margin"
-        android:layout_marginBottom="@dimen/vertical_page_margin"
-        android:text="@string/intro_message" />
-
-    <GridView android:id="@android:id/list"
-        style="@style/Widget.SampleDashboard.Grid"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:paddingLeft="@dimen/horizontal_page_margin"
-        android:paddingRight="@dimen/horizontal_page_margin"
-        android:paddingBottom="@dimen/vertical_page_margin"
-        android:scrollbarStyle="outsideOverlay" />
-
-</LinearLayout>
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/layout/sample_dashboard_item.xml b/common/build/templates/ActivityCards/_MODULE_/src/template/res/layout/sample_dashboard_item.xml
deleted file mode 100644
index 38987ee..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/layout/sample_dashboard_item.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/Widget.SampleDashboard.Item"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView android:id="@android:id/text1"
-        style="@style/Widget.SampleDashboard.Item.Title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <TextView android:id="@android:id/text2"
-        style="@style/Widget.SampleDashboard.Item.Description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/common/build/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-strings.xml.ftl b/common/build/templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-strings.xml.ftl
deleted file mode 100644
index e772a05..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/values/activitycards-strings.xml.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#include "/ActivityCardsCommon.ftli">
-
-<resources>
-<#list sample.activity as activity>
-    <string name="<@make_activity_res activity "title"/>">${activity.title!"activity.title"}</string>
-    <string name="<@make_activity_res activity "description"/>">${activity.description!"activity.description"}</string>
-</#list>
-</resources>
\ No newline at end of file
diff --git a/common/build/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml b/common/build/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml
deleted file mode 100644
index cafe531..0000000
--- a/common/build/templates/ActivityCards/_MODULE_/src/template/res/values/styles.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-
-    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleContentContainer">
-        <item name="android:paddingTop">@dimen/vertical_page_margin</item>
-        <item name="android:paddingBottom">@dimen/vertical_page_margin</item>
-        <item name="android:paddingLeft">@dimen/horizontal_page_margin</item>
-        <item name="android:paddingRight">@dimen/horizontal_page_margin</item>
-    </style>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Grid" parent="Widget">
-        <item name="android:stretchMode">columnWidth</item>
-        <item name="android:columnWidth">200dp</item>
-        <item name="android:numColumns">auto_fit</item>
-        <item name="android:drawSelectorOnTop">true</item>
-        <item name="android:horizontalSpacing">@dimen/margin_medium</item>
-        <item name="android:verticalSpacing">@dimen/margin_medium</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item" parent="Widget">
-        <item name="android:background">@drawable/sample_dashboard_item_background</item>
-        <item name="android:paddingTop">@dimen/margin_small</item>
-        <item name="android:paddingLeft">@dimen/margin_medium</item>
-        <item name="android:paddingRight">@dimen/margin_medium</item>
-        <item name="android:paddingBottom">@dimen/margin_medium</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item.Title" parent="Widget">
-        <item name="android:layout_marginBottom">@dimen/margin_tiny</item>
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:textColor">#09c</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">24sp</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item.Description" parent="Widget">
-        <item name="android:textAppearance">?android:textAppearanceSmall</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-</resources>
diff --git a/common/build/templates/SingleView/_MODULE_/README-singleview.txt b/common/build/templates/SingleView/_MODULE_/README-singleview.txt
deleted file mode 100644
index d91cfbf..0000000
--- a/common/build/templates/SingleView/_MODULE_/README-singleview.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Steps to implement SingleView template:
--in template-params.xml.ftl:
-    -add the following line to common imports
-        <common src="activities"/>
-
-    -add a string for the action button's text using the element name "sample_action".  This element should be a child
-     of <strings>:
-        <strings>
-        ...
-        <sample_action>ButtonText</sample_action>
-        ...
-        </strings>
-
-
-
--Add a Fragment to handle behavior.  In your MainActivity.java class, it will reference a Fragment called
-   (yourProjectName)Fragment.java.  Create that file in your project, using the "main" source folder instead of
-   "common" or "templates".
-   for instance, if your package name is com.example.foo, create the file
-   src/main/java/com/example/foo/FooFragment.java
-
-
--Within this fragment, make sure that the onCreate method has the line
- "setHasOptionsMenu(true);", to enable the fragment to handle menu events.
-
--In order to override menu events, override onOptionsItemSelected.
-
--refer to sampleSamples/singleViewSample for a reference implementation of a
-project built on this template.
-
-
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/java/_PACKAGE_/MainActivity.java.ftl b/common/build/templates/SingleView/_MODULE_/src/template/java/_PACKAGE_/MainActivity.java.ftl
deleted file mode 100755
index 0d6e684..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/java/_PACKAGE_/MainActivity.java.ftl
+++ /dev/null
@@ -1,76 +0,0 @@
-<#ftl>
-<#--
-        Copyright 2013 The Android Open Source Project
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
--->
-
-package ${sample.package};
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.view.Menu;
-
-import com.example.android.common.activities.SampleActivityBase;
-import com.example.android.common.logger.Log;
-import com.example.android.common.logger.LogFragment;
-import com.example.android.common.logger.LogWrapper;
-import com.example.android.common.logger.MessageOnlyLogFilter;
-
-/**
- * A simple launcher activity containing a summary sample description
- * and a few action bar buttons.
- */
-public class MainActivity extends SampleActivityBase {
-
-    public static final String TAG = "MainActivity";
-
-    public static final String FRAGTAG = "${sample.name?cap_first}Fragment";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        ${sample.name?cap_first}Fragment fragment = new ${sample.name?cap_first}Fragment();
-        transaction.add(fragment, FRAGTAG);
-        transaction.commit();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
-
-    /** Create a chain of targets that will receive log data */
-    @Override
-    public void initializeLogging() {
-        // Wraps Android's native log framework.
-        LogWrapper logWrapper = new LogWrapper();
-        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
-        Log.setLogNode(logWrapper);
-
-        // Filter strips out everything except the message text.
-        MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter();
-        logWrapper.setNext(msgFilter);
-
-        // On screen logging via a fragment with a TextView.
-        LogFragment logFragment = (LogFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.log_fragment);
-        msgFilter.setNext(logFragment.getLogView());
-
-        Log.i(TAG, "Ready");
-    }
-}
\ No newline at end of file
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/layout/activity_main.xml b/common/build/templates/SingleView/_MODULE_/src/template/res/layout/activity_main.xml
deleted file mode 100755
index 3c4777c..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/layout/activity_main.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-    <TextView android:id="@+id/sample_output"
-              style="@style/Widget.SampleMessage"
-              android:layout_weight="1"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:text="@string/intro_message" />
-    <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dp"
-            android:background="@android:color/darker_gray"/>
-    <fragment
-            android:name="com.example.android.common.logger.LogFragment"
-            android:id="@+id/log_fragment"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-</LinearLayout>
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/menu/main.xml b/common/build/templates/SingleView/_MODULE_/src/template/res/menu/main.xml
deleted file mode 100644
index 2c3515d..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/menu/main.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/sample_action"
-          android:showAsAction="ifRoom|withText"
-          android:title="@string/sample_action" />
-</menu>
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/common/build/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml b/common/build/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:shadowDy">-6.5</item>
-    </style>
-
-</resources>
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl b/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl
deleted file mode 100755
index 0eb34b7..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/values/strings.xml.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="sample_action">${sample.strings.sample_action}</string>
-</resources>
diff --git a/common/build/templates/SingleView/_MODULE_/src/template/res/values/styles.xml b/common/build/templates/SingleView/_MODULE_/src/template/res/values/styles.xml
deleted file mode 100644
index d3f82ff..0000000
--- a/common/build/templates/SingleView/_MODULE_/src/template/res/values/styles.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-
-    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
-    <style name="AppTheme" parent="Theme.Base" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
-    <style name="Widget.SampleMessageTile">
-        <item name="android:background">@drawable/tile</item>
-        <item name="android:shadowColor">#7F000000</item>
-        <item name="android:shadowDy">-3.5</item>
-        <item name="android:shadowRadius">2</item>
-    </style>
-
-
-    <style name="Widget.SampleOutput">
-        <item name="android:padding">@dimen/margin_medium</item>
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
-    <style name="Log" parent="Widget.SampleOutput">
-        <item name="android:typeface">monospace</item>
-    </style>
-
-</resources>
diff --git a/common/build/templates/base/_MODULE_/build.gradle.ftl b/common/build/templates/base/_MODULE_/build.gradle.ftl
deleted file mode 100644
index d8309ed..0000000
--- a/common/build/templates/base/_MODULE_/build.gradle.ftl
+++ /dev/null
@@ -1,78 +0,0 @@
-<#--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-
-apply plugin: 'android'
-
-dependencies {
-    // Add the support lib that is appropriate for SDK ${sample.minSdk}
-<#if sample.minSdk?number < 7>
-    compile "com.android.support:support-v4:18.0.+"
-<#elseif sample.minSdk?number < 13>
-    compile "com.android.support:support-v4:18.0.+"
-    compile "com.android.support:gridlayout-v7:18.0.+"
-<#else>
-    compile "com.android.support:support-v13:18.0.+"
-</#if>
-}
-
-// 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 {
-     <#-- Note that target SDK is hardcoded in this template. We expect all samples
-          to always use the most current SDK as their target. -->
-    compileSdkVersion 18
-    buildToolsVersion "18.0.1"
-
-
-<#noparse>
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-    }
-</#noparse>
-}
-
-task preflight (dependsOn: parent.preflight) {}
-
-// 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.
-<#noparse>
-android.applicationVariants.each { variant ->
-    tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
-}
-</#noparse>
-
-
-
diff --git a/common/build/templates/base/_MODULE_/src/template/res/drawable-hdpi/tile.9.png b/common/build/templates/base/_MODULE_/src/template/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/base/_MODULE_/src/template/res/layout/activity_main.xml b/common/build/templates/base/_MODULE_/src/template/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/common/build/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml b/common/build/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/common/build/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml b/common/build/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:shadowDy">-6.5</item>
-    </style>
-
-</resources>
diff --git a/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl b/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl
deleted file mode 100755
index 082c96f..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/values/base-strings.xml.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-    <string name="app_name">${sample.name}</string>
-    <string name="intro_message">
-        <![CDATA[
-        ${sample.strings.intro}
-        ]]>
-    </string>
-</resources>
\ No newline at end of file
diff --git a/common/build/templates/base/_MODULE_/src/template/res/values/dimens.xml b/common/build/templates/base/_MODULE_/src/template/res/values/dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/values/dimens.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/common/build/templates/base/_MODULE_/src/template/res/values/styles.xml b/common/build/templates/base/_MODULE_/src/template/res/values/styles.xml
deleted file mode 100644
index 404623e..0000000
--- a/common/build/templates/base/_MODULE_/src/template/res/values/styles.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-
-    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
-    <style name="Widget.SampleMessageTile">
-        <item name="android:background">@drawable/tile</item>
-        <item name="android:shadowColor">#7F000000</item>
-        <item name="android:shadowDy">-3.5</item>
-        <item name="android:shadowRadius">2</item>
-    </style>
-
-</resources>
diff --git a/common/build/templates/create/._IDE_/.name.ftl b/common/build/templates/create/._IDE_/.name.ftl
deleted file mode 100644
index 52f9788..0000000
--- a/common/build/templates/create/._IDE_/.name.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-<#ftl>
-${sample.name}
diff --git a/common/build/templates/create/._IDE_/gradle.xml b/common/build/templates/create/._IDE_/gradle.xml
deleted file mode 100644
index a9986e4..0000000
--- a/common/build/templates/create/._IDE_/gradle.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$/build.gradle" />
-        <option name="useAutoImport" value="true" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
-
diff --git a/common/build/templates/create/._IDE_/modules.xml.ftl b/common/build/templates/create/._IDE_/modules.xml.ftl
deleted file mode 100644
index 4108150..0000000
--- a/common/build/templates/create/._IDE_/modules.xml.ftl
+++ /dev/null
@@ -1,10 +0,0 @@
-<#ftl>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-        <module fileurl="file://$PROJECT_DIR$/${sample.name}.iml" filepath="$PROJECT_DIR$/${sample.name}.iml" />
-        <module fileurl="file://$PROJECT_DIR$/${meta.module}/${meta.module}.iml" filepath="$PROJECT_DIR$/${meta.module}/${meta.module}.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/common/build/templates/create/_MODULE_/_MODULE_.iml.ftl b/common/build/templates/create/_MODULE_/_MODULE_.iml.ftl
deleted file mode 100644
index fd6972c..0000000
--- a/common/build/templates/create/_MODULE_/_MODULE_.iml.ftl
+++ /dev/null
@@ -1,84 +0,0 @@
-<#--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":${sample.name}" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/exploded-bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android 4.2 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="android-support-v4" level="project" />
-  </component>
-</module>
-
diff --git a/common/build/templates/create/_MODULE_/build.gradle.ftl b/common/build/templates/create/_MODULE_/build.gradle.ftl
deleted file mode 100644
index c662fec..0000000
--- a/common/build/templates/create/_MODULE_/build.gradle.ftl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<#-- This build script is a bootstrapper for the "real" android build script that
-is contained in templates/base. It includes only what's necessary for Android Studio
-to recognize this as an Android project and start the template engine. -->
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.4.2'
-    }
-}
-
-apply plugin: 'android'
-
-
-android {
-     <#-- Note that target SDK is hardcoded in this template. We expect all samples
-          to always use the most current SDK as their target. -->
-    compileSdkVersion 17
-    buildToolsVersion "17.0.0"
-
-    defaultConfig {
-        minSdkVersion ${sample.minSdk}
-        targetSdkVersion 17
-    }
-}
-
-task preflight (dependsOn: parent.preflight) {}
-
-// 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.
-<#noparse>
-android.applicationVariants.each { variant ->
-    tasks.getByPath("prepare${variant.name.capitalize()}Dependencies").dependsOn preflight
-}
-</#noparse>
-
-
-
diff --git a/common/build/templates/create/_MODULE_/gitignore b/common/build/templates/create/_MODULE_/gitignore
deleted file mode 100644
index f1e8ad1..0000000
--- a/common/build/templates/create/_MODULE_/gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src/template/
-src/common/
\ No newline at end of file
diff --git a/common/build/templates/create/_MODULE_/proguard-project.txt b/common/build/templates/create/_MODULE_/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/common/build/templates/create/_MODULE_/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/common/build/templates/create/_MODULE_/src/main/AndroidManifest.xml.ftl b/common/build/templates/create/_MODULE_/src/main/AndroidManifest.xml.ftl
deleted file mode 100644
index fd49b3e..0000000
--- a/common/build/templates/create/_MODULE_/src/main/AndroidManifest.xml.ftl
+++ /dev/null
@@ -1,24 +0,0 @@
-<#ftl>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="${sample.package}"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="${sample.minSdk}" android:targetSdkVersion="17" />
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme">
-
-        <activity android:name=".MainActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-
-</manifest>
diff --git a/common/build/templates/create/_PROJECT_.iml.ftl b/common/build/templates/create/_PROJECT_.iml.ftl
deleted file mode 100644
index 81076f2..0000000
--- a/common/build/templates/create/_PROJECT_.iml.ftl
+++ /dev/null
@@ -1,14 +0,0 @@
-<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-<component name="NewModuleRootManager" inherit-compiler-output="true">
-<exclude-output />
-<content url="file://$MODULE_DIR$">
-    <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    <excludeFolder url="file://$MODULE_DIR$/gradle" />
-    <excludeFolder url="file://$MODULE_DIR$/.idea" />
-    <excludeFolder url="file://$MODULE_DIR$/buildSrc" />
-    <excludeFolder url="file://$MODULE_DIR$/build" />
-</content>
-<orderEntry type="inheritedJdk" />
-<orderEntry type="sourceFolder" forTests="false" />
-</component>
-</module>
diff --git a/common/build/templates/create/build.gradle.ftl b/common/build/templates/create/build.gradle.ftl
deleted file mode 100644
index 8a2e4da..0000000
--- a/common/build/templates/create/build.gradle.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<#ftl>
-// BEGIN_EXCLUDE
-apply from: "../../common/build/build.gradle"
-samplegen {
-pathToSamplesCommon "../../common"
-}
-// END_EXCLUDE
\ No newline at end of file
diff --git a/common/build/templates/create/buildSrc/build.gradle.ftl b/common/build/templates/create/buildSrc/build.gradle.ftl
deleted file mode 100644
index dcdd01a..0000000
--- a/common/build/templates/create/buildSrc/build.gradle.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-<#ftl>
-repositories {
-    mavenCentral()
-}
-dependencies {
-    compile 'org.freemarker:freemarker:2.3.20'
-}
-
-sourceSets {
-    main {
-        groovy {
-            srcDir new File(rootDir, "../${meta.common}/build/buildSrc/src/main/groovy")
-        }
-    }
-}
-
diff --git a/common/build/templates/create/gradle/wrapper/gradle-wrapper.jar b/common/build/templates/create/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/common/build/templates/create/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/common/build/templates/create/gradle/wrapper/gradle-wrapper.properties b/common/build/templates/create/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 5c22dec..0000000
--- a/common/build/templates/create/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/common/build/templates/create/gradlew b/common/build/templates/create/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/common/build/templates/create/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/common/build/templates/create/gradlew.bat b/common/build/templates/create/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/common/build/templates/create/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off

-@rem ##########################################################################

-@rem

-@rem  Gradle startup script for Windows

-@rem

-@rem ##########################################################################

-

-@rem Set local scope for the variables with windows NT shell

-if "%OS%"=="Windows_NT" setlocal

-

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

-set DEFAULT_JVM_OPTS=

-

-set DIRNAME=%~dp0

-if "%DIRNAME%" == "" set DIRNAME=.

-set APP_BASE_NAME=%~n0

-set APP_HOME=%DIRNAME%

-

-@rem Find java.exe

-if defined JAVA_HOME goto findJavaFromJavaHome

-

-set JAVA_EXE=java.exe

-%JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

-

-echo.

-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:findJavaFromJavaHome

-set JAVA_HOME=%JAVA_HOME:"=%

-set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-

-if exist "%JAVA_EXE%" goto init

-

-echo.

-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:init

-@rem Get command-line arguments, handling Windowz variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_args

-if "%@eval[2+2]" == "4" goto 4NT_args

-

-:win9xME_args

-@rem Slurp the command line arguments.

-set CMD_LINE_ARGS=

-set _SKIP=2

-

-:win9xME_args_slurp

-if "x%~1" == "x" goto execute

-

-set CMD_LINE_ARGS=%*

-goto execute

-

-:4NT_args

-@rem Get arguments from the 4NT Shell from JP Software

-set CMD_LINE_ARGS=%$

-

-:execute

-@rem Setup the command line

-

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-

-@rem Execute Gradle

-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

-

-:end

-@rem End local scope for the variables with windows NT shell

-if "%ERRORLEVEL%"=="0" goto mainEnd

-

-:fail

-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

-rem the _cmd.exe /c_ return code!

-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

-exit /b 1

-

-:mainEnd

-if "%OS%"=="Windows_NT" endlocal

-

-:omega

diff --git a/common/build/templates/create/settings.gradle.ftl b/common/build/templates/create/settings.gradle.ftl
deleted file mode 100644
index 17556da..0000000
--- a/common/build/templates/create/settings.gradle.ftl
+++ /dev/null
@@ -1,2 +0,0 @@
-<#ftl>
-include '${meta.module}'
diff --git a/common/build/templates/create/template-params.xml.ftl b/common/build/templates/create/template-params.xml.ftl
deleted file mode 100644
index 4085730..0000000
--- a/common/build/templates/create/template-params.xml.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<#ftl>
-<sample>
-    <name>${sample.name}</name>
-    <package>${sample.package}</package>
-
-
-    <!-- change minSdk if needed-->
-    <minSdk>${sample.minSdk}</minSdk>
-
-
-    <strings>
-        <intro>
-            <![CDATA[
-            Introductory text that explains what the sample is intended to demonstrate. Edit
-            in template-params.xml.
-            ]]>
-        </intro>
-    </strings>
-
-    <template src="base"/>
-    <common src="logger"/>
-
-</sample>
diff --git a/common/build/templates/include/c-style-copyright.ftl b/common/build/templates/include/c-style-copyright.ftl
deleted file mode 100644
index af10946..0000000
--- a/common/build/templates/include/c-style-copyright.ftl
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-* Copyright 2013 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
diff --git a/common/build/templates/include/common.ftl b/common/build/templates/include/common.ftl
deleted file mode 100644
index f116b0c..0000000
--- a/common/build/templates/include/common.ftl
+++ /dev/null
@@ -1,6 +0,0 @@
-<#-- Add the appropriate copyright header -->
-<#if meta.outputFile?ends_with("java")>
-    <#include "c-style-copyright.ftl">
-<#elseif meta.outputFile?ends_with("xml")>
-    <#include "xml-style-copyright.ftl">
-</#if>
diff --git a/common/build/templates/include/ftl-style-copyright.ftl b/common/build/templates/include/ftl-style-copyright.ftl
deleted file mode 100644
index 9b8acec..0000000
--- a/common/build/templates/include/ftl-style-copyright.ftl
+++ /dev/null
@@ -1,15 +0,0 @@
-<#--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
diff --git a/common/build/templates/include/ignoredir.fmpp b/common/build/templates/include/ignoredir.fmpp
deleted file mode 100644
index e69de29..0000000
--- a/common/build/templates/include/ignoredir.fmpp
+++ /dev/null
diff --git a/common/build/templates/include/xml-style-copyright.ftl b/common/build/templates/include/xml-style-copyright.ftl
deleted file mode 100644
index f961eb7..0000000
--- a/common/build/templates/include/xml-style-copyright.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
diff --git a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGatt/build.gradle b/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGatt/build.gradle
index 945e1f5..9f4459b 100644
--- a/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGatt/build.gradle
+++ b/connectivity/bluetooth/BluetoothLeGatt/BluetoothLeGatt/build.gradle
@@ -2,5 +2,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/build.gradle b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/build.gradle
index 0baece9..10fb811 100644
--- a/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/build.gradle
+++ b/connectivity/network/BasicNetworkDemo/BasicNetworkDemo/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/connectivity/network/NetworkConnect/NetworkConnect/build.gradle b/connectivity/network/NetworkConnect/NetworkConnect/build.gradle
index 0baece9..4c38ffd 100644
--- a/connectivity/network/NetworkConnect/NetworkConnect/build.gradle
+++ b/connectivity/network/NetworkConnect/NetworkConnect/build.gradle
@@ -1,3 +1,13 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
 apply plugin: 'android'
 
 dependencies {
@@ -6,5 +16,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/build.gradle b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/build.gradle
index e802f1b..9424fe8 100644
--- a/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/build.gradle
+++ b/connectivity/sync/BasicSyncAdapter/BasicSyncAdapter/build.gradle
@@ -1,3 +1,13 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
 apply plugin: 'android'
 
 repositories {
@@ -11,5 +21,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/content/contacts/BasicContactables/BasicContactables/build.gradle b/content/contacts/BasicContactables/BasicContactables/build.gradle
index 0baece9..10fb811 100644
--- a/content/contacts/BasicContactables/BasicContactables/build.gradle
+++ b/content/contacts/BasicContactables/BasicContactables/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/content/multiuser/AppRestrictions/AppRestrictions/build.gradle b/content/multiuser/AppRestrictions/AppRestrictions/build.gradle
index 945e1f5..9f4459b 100644
--- a/content/multiuser/AppRestrictions/AppRestrictions/build.gradle
+++ b/content/multiuser/AppRestrictions/AppRestrictions/build.gradle
@@ -2,5 +2,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle b/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle
index 0baece9..10fb811 100644
--- a/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle
+++ b/input/gestures/BasicGestureDetect/BasicGestureDetect/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle b/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle
index 945e1f5..9f4459b 100644
--- a/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle
+++ b/input/multitouch/BasicMultitouch/BasicMultitouch/build.gradle
@@ -2,5 +2,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/media/BasicMediaDecoder/BasicMediaDecoder/build.gradle b/media/BasicMediaDecoder/BasicMediaDecoder/build.gradle
index 52981b5..b89e935 100644
--- a/media/BasicMediaDecoder/BasicMediaDecoder/build.gradle
+++ b/media/BasicMediaDecoder/BasicMediaDecoder/build.gradle
@@ -14,7 +14,7 @@
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "17.0.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         minSdkVersion 16
diff --git a/media/BasicMediaRouter/BasicMediaRouter/build.gradle b/media/BasicMediaRouter/BasicMediaRouter/build.gradle
index 945e1f5..9f4459b 100644
--- a/media/BasicMediaRouter/BasicMediaRouter/build.gradle
+++ b/media/BasicMediaRouter/BasicMediaRouter/build.gradle
@@ -2,5 +2,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/sampleSamples/BaseSample/BaseSampleSample/build.gradle b/sampleSamples/BaseSample/BaseSampleSample/build.gradle
deleted file mode 100644
index 7f993fa..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.4.2'
-    }
-}
-
-apply plugin: 'android'
-
-
-android {
-    compileSdkVersion 17
-    buildToolsVersion "17.0.0"
-
-    defaultConfig {
-        minSdkVersion 4
-        targetSdkVersion 17
-    }
-}
-
-task preflight (dependsOn: parent.preflight) {}
-
-// 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
-}
-
-
-
diff --git a/sampleSamples/BaseSample/BaseSampleSample/proguard-project.txt b/sampleSamples/BaseSample/BaseSampleSample/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/sampleSamples/BaseSample/BaseSampleSample/src/main/AndroidManifest.xml b/sampleSamples/BaseSample/BaseSampleSample/src/main/AndroidManifest.xml
deleted file mode 100644
index 456eecf..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basesample"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="17" />
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme">
-
-        <activity android:name=".MainActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-
-</manifest>
diff --git a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-hdpi/ic_launcher.png b/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b1efaf4..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-mdpi/ic_launcher.png b/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f5f9244..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-xhdpi/ic_launcher.png b/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d07b3f..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6ef21e1..0000000
--- a/sampleSamples/BaseSample/BaseSampleSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/BaseSample/build.gradle b/sampleSamples/BaseSample/build.gradle
deleted file mode 100644
index bf09c05..0000000
--- a/sampleSamples/BaseSample/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-// BEGIN_EXCLUDE
-apply from: "../../common/build/build.gradle"
-samplegen {
-pathToSamplesCommon "../../common"
-}
-// END_EXCLUDE
\ No newline at end of file
diff --git a/sampleSamples/BaseSample/template-params.xml b/sampleSamples/BaseSample/template-params.xml
deleted file mode 100644
index 6cd6ee9..0000000
--- a/sampleSamples/BaseSample/template-params.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<sample>
-    <name>BaseSample</name>
-    <package>com.example.android.basesample</package>
-
-
-    <!--TODO: change minSdk if needed-->
-    <minSdk>4</minSdk>
-
-
-    <template src="base"/>
-
-    <common src="logger"/>
-
-    <strings>
-        <intro>
-            <![CDATA[
-            Introductory text that explains what the sample is intended to demonstrate. Edit
-            in TemplateData.xml.
-            ]]>
-        </intro>
-    </strings>
-</sample>
diff --git a/sampleSamples/singleViewSample/build.gradle b/sampleSamples/singleViewSample/build.gradle
deleted file mode 100644
index bf09c05..0000000
--- a/sampleSamples/singleViewSample/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-// BEGIN_EXCLUDE
-apply from: "../../common/build/build.gradle"
-samplegen {
-pathToSamplesCommon "../../common"
-}
-// END_EXCLUDE
\ No newline at end of file
diff --git a/sampleSamples/singleViewSample/buildSrc/build.gradle b/sampleSamples/singleViewSample/buildSrc/build.gradle
deleted file mode 100644
index b2978f5..0000000
--- a/sampleSamples/singleViewSample/buildSrc/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-repositories {
-    mavenCentral()
-}
-dependencies {
-    compile 'org.freemarker:freemarker:2.3.20'
-}
-
-sourceSets {
-    main {
-        groovy {
-            srcDir new File(rootDir, "../../../common/build/buildSrc/src/main/groovy")
-        }
-    }
-}
-
diff --git a/sampleSamples/singleViewSample/gradle/wrapper/gradle-wrapper.jar b/sampleSamples/singleViewSample/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/sampleSamples/singleViewSample/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/singleViewSample/gradle/wrapper/gradle-wrapper.properties b/sampleSamples/singleViewSample/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 5c22dec..0000000
--- a/sampleSamples/singleViewSample/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/sampleSamples/singleViewSample/gradlew b/sampleSamples/singleViewSample/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/sampleSamples/singleViewSample/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/sampleSamples/singleViewSample/gradlew.bat b/sampleSamples/singleViewSample/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/sampleSamples/singleViewSample/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off

-@rem ##########################################################################

-@rem

-@rem  Gradle startup script for Windows

-@rem

-@rem ##########################################################################

-

-@rem Set local scope for the variables with windows NT shell

-if "%OS%"=="Windows_NT" setlocal

-

-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

-set DEFAULT_JVM_OPTS=

-

-set DIRNAME=%~dp0

-if "%DIRNAME%" == "" set DIRNAME=.

-set APP_BASE_NAME=%~n0

-set APP_HOME=%DIRNAME%

-

-@rem Find java.exe

-if defined JAVA_HOME goto findJavaFromJavaHome

-

-set JAVA_EXE=java.exe

-%JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

-

-echo.

-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:findJavaFromJavaHome

-set JAVA_HOME=%JAVA_HOME:"=%

-set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-

-if exist "%JAVA_EXE%" goto init

-

-echo.

-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

-echo.

-echo Please set the JAVA_HOME variable in your environment to match the

-echo location of your Java installation.

-

-goto fail

-

-:init

-@rem Get command-line arguments, handling Windowz variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_args

-if "%@eval[2+2]" == "4" goto 4NT_args

-

-:win9xME_args

-@rem Slurp the command line arguments.

-set CMD_LINE_ARGS=

-set _SKIP=2

-

-:win9xME_args_slurp

-if "x%~1" == "x" goto execute

-

-set CMD_LINE_ARGS=%*

-goto execute

-

-:4NT_args

-@rem Get arguments from the 4NT Shell from JP Software

-set CMD_LINE_ARGS=%$

-

-:execute

-@rem Setup the command line

-

-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-

-@rem Execute Gradle

-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

-

-:end

-@rem End local scope for the variables with windows NT shell

-if "%ERRORLEVEL%"=="0" goto mainEnd

-

-:fail

-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

-rem the _cmd.exe /c_ return code!

-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

-exit /b 1

-

-:mainEnd

-if "%OS%"=="Windows_NT" endlocal

-

-:omega

diff --git a/sampleSamples/singleViewSample/settings.gradle b/sampleSamples/singleViewSample/settings.gradle
deleted file mode 100644
index e57da67..0000000
--- a/sampleSamples/singleViewSample/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include 'singleViewSampleSample'
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/.gitignore b/sampleSamples/singleViewSample/singleViewSampleSample/.gitignore
deleted file mode 100644
index f1e8ad1..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src/template/
-src/common/
\ No newline at end of file
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/build.gradle b/sampleSamples/singleViewSample/singleViewSampleSample/build.gradle
deleted file mode 100644
index 0481875..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/build.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.5.+'
-    }
-}
-
-apply plugin: 'android'
-
-dependencies {
-    // Add the support lib that is appropriate for SDK 4
-    compile "com.android.support:support-v4:18.0.+"
-}
-
-// 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 18
-    buildToolsVersion "18.0.1"
-
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-    }
-}
-
-task preflight (dependsOn: parent.preflight) {}
-
-// 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
-}
-
-
-
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/proguard-project.txt b/sampleSamples/singleViewSample/singleViewSampleSample/proguard-project.txt
deleted file mode 100644
index 0d8f171..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
- To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/AndroidManifest.xml b/sampleSamples/singleViewSample/singleViewSampleSample/src/main/AndroidManifest.xml
deleted file mode 100644
index f8aba3c..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.singleviewsample"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="17" />
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme"
-        android:uiOptions="splitActionBarWhenNarrow">
-
-        // Be sure to add "splitActionBarWhenNarrow", so the button appears on the bottom of the
-        // screen when your device is in portrait mode.
-        <activity android:name=".MainActivity"
-                  android:label="@string/app_name"
-                  android:uiOptions="splitActionBarWhenNarrow">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-
-</manifest>
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/java/com/example/android/singleviewsample/SingleViewSampleFragment.java b/sampleSamples/singleViewSample/singleViewSampleSample/src/main/java/com/example/android/singleviewsample/SingleViewSampleFragment.java
deleted file mode 100644
index 1d87fce..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/java/com/example/android/singleviewsample/SingleViewSampleFragment.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* Copyright (C) 2012 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package com.example.android.singleviewsample;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.MenuItem;
-
-import com.example.android.common.logger.Log;
-
-/**
- * This fragment will contain all of the logic specific to your sample.  Use the override for
- * onOptionsItemSelected below to define the behavior for when a user clicks a menu item in the
- * sample application.
- */
-public class SingleViewSampleFragment extends Fragment {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // TODO Make *sure* this line is in your onCreate method.  It gives the fragment the ability
-        // to react when the user clicks a menu item.
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        Log.i("SingleViewSampleFragment", "No action defined for this item.");
-        return true;
-    }
-}
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-hdpi/ic_launcher.png b/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b1efaf4..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-mdpi/ic_launcher.png b/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f5f9244..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-xhdpi/ic_launcher.png b/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d07b3f..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-xxhdpi/ic_launcher.png b/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6ef21e1..0000000
--- a/sampleSamples/singleViewSample/singleViewSampleSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/sampleSamples/singleViewSample/template-params.xml b/sampleSamples/singleViewSample/template-params.xml
deleted file mode 100644
index 1cf7f79..0000000
--- a/sampleSamples/singleViewSample/template-params.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<sample>
-    <name>singleViewSample</name>
-    <package>com.example.android.singleviewsample</package>
-
-
-    <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
-
-    <template src="base"/>
-    <template src="SingleView"/>
-    <common src="logger"/>
-    <common src="activities"/>
-
-    <strings>
-        // TODO: Update the intro text for your sample.
-        <intro>
-            <![CDATA[
-            Introductory text that explains what the sample is intended to demonstrate.
-            ]]>
-        </intro>
-        <sample_action>Action!</sample_action>
-    </strings>
-</sample>
diff --git a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle
index 0baece9..10fb811 100644
--- a/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle
+++ b/security/keystore/BasicAndroidKeyStore/BasicAndroidKeyStore/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..45caa08
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,63 @@
+include(
+  ':connectivity:bluetooth:BluetoothLeGatt:BluetoothLeGatt',
+  ':connectivity:bluetooth:BluetoothLeGatt',
+  ':connectivity:sync:BasicSyncAdapter',
+  ':connectivity:sync:BasicSyncAdapter:BasicSyncAdapter',
+  ':connectivity:network:BasicNetworkDemo:BasicNetworkDemo',
+  ':connectivity:network:BasicNetworkDemo',
+  ':connectivity:network:NetworkConnect:NetworkConnect',
+  ':connectivity:network:NetworkConnect',
+  ':content:multiuser:AppRestrictions:AppRestrictions',
+  ':content:multiuser:AppRestrictions',
+  ':content:contacts:BasicContactables:BasicContactables',
+  ':content:contacts:BasicContactables',
+  ':sampleSamples:BaseSample:BaseSampleSample',
+  ':sampleSamples:BaseSample',
+  ':sampleSamples:singleViewSample:singleViewSampleSample',
+  ':sampleSamples:singleViewSample',
+  ':sampleSamples:ActivityCards:ActivityCardsSample',
+  ':sampleSamples:ActivityCards',
+  ':ui:notifications:CustomNotifications:CustomNotifications',
+  ':ui:notifications:CustomNotifications',
+  ':ui:notifications:BasicNotifications:BasicNotifications',
+  ':ui:notifications:BasicNotifications',
+  ':ui:ImmersiveMode',
+  ':ui:ImmersiveMode:ImmersiveModeSample',
+  ':ui:actionbarcompat:ListPopupMenu:ListPopupMenu',
+  ':ui:actionbarcompat:ListPopupMenu',
+  ':ui:actionbarcompat:Styled:Styled',
+  ':ui:actionbarcompat:Styled',
+  ':ui:actionbarcompat:SearchView',
+  ':ui:actionbarcompat:ShareActionProvider:ShareActionProvider',
+  ':ui:actionbarcompat:ShareActionProvider',
+  ':ui:actionbarcompat:ListViewModalSelect',
+  ':ui:actionbarcompat:Basic',
+  ':ui:actionbarcompat:Basic:Basic',
+  ':ui:actionbar:DoneBar',
+  ':ui:actionbar:DoneBar:DoneBar',
+  ':ui:accessibility:BasicAccessibility:BasicAccessibility',
+  ':ui:accessibility:BasicAccessibility',
+  ':ui:lists:CustomChoiceList:CustomChoiceList',
+  ':ui:lists:CustomChoiceList',
+  ':ui:views:TextSwitcher:TextSwitcher',
+  ':ui:views:TextSwitcher',
+  ':ui:views:HorizontalPaging:HorizontalPaging',
+  ':ui:views:HorizontalPaging',
+  ':ui:holo:BorderlessButtons:BorderlessButtons',
+  ':ui:holo:BorderlessButtons',
+  ':security:keystore:BasicAndroidKeyStore:BasicAndroidKeyStore',
+  ':security:keystore:BasicAndroidKeyStore',
+  ':views:TextLinkify:TextLinkify',
+  ':views:TextLinkify',
+  ':background:alarms:repeatingAlarm',
+  ':background:alarms:repeatingAlarm:repeatingAlarmSample',
+  ':media:BasicMediaRouter:BasicMediaRouter',
+  ':media:BasicMediaRouter',
+  ':media:BasicMediaDecoder:BasicMediaDecoder',
+  ':media:BasicMediaDecoder',
+  ':media:MediaRecorder:MediaRecorder',
+  ':media:MediaRecorder',
+  ':input:multitouch:BasicMultitouch:BasicMultitouch',
+  ':input:multitouch:BasicMultitouch',
+  ':input:gestures:BasicGestureDetect:BasicGestureDetect',
+  ':input:gestures:BasicGestureDetect')
diff --git a/settings.gradle.old b/settings.gradle.old
new file mode 100644
index 0000000..03da487
--- /dev/null
+++ b/settings.gradle.old
@@ -0,0 +1,63 @@
+include(
+  ':connectivity:bluetooth:BluetoothLeGatt:BluetoothLeGatt',
+  ':connectivity:bluetooth:BluetoothLeGatt',
+  ':connectivity:sync:BasicSyncAdapter',
+  ':connectivity:sync:BasicSyncAdapter:BasicSyncAdapter',
+  ':connectivity:network:BasicNetworkDemo:BasicNetworkDemo',
+  ':connectivity:network:BasicNetworkDemo',
+  //':connectivity:network:NetworkConnect:NetworkConnect',
+  //':connectivity:network:NetworkConnect',
+  ':content:multiuser:AppRestrictions:AppRestrictions',
+  ':content:multiuser:AppRestrictions',
+  ':content:contacts:BasicContactables:BasicContactables',
+  ':content:contacts:BasicContactables',
+  ':sampleSamples:BaseSample:BaseSampleSample',
+  ':sampleSamples:BaseSample',
+  ':sampleSamples:singleViewSample:singleViewSampleSample',
+  ':sampleSamples:singleViewSample',
+  ':sampleSamples:ActivityCards:ActivityCardsSample',
+  ':sampleSamples:ActivityCards',
+  ':ui:notifications:CustomNotifications:CustomNotifications',
+  ':ui:notifications:CustomNotifications',
+  ':ui:notifications:BasicNotifications:BasicNotifications',
+  ':ui:notifications:BasicNotifications',
+  ':ui:ImmersiveMode',
+  ':ui:ImmersiveMode:ImmersiveModeSample',
+  ':ui:actionbarcompat:ListPopupMenu:ListPopupMenu',
+  ':ui:actionbarcompat:ListPopupMenu',
+  ':ui:actionbarcompat:Styled:Styled',
+  ':ui:actionbarcompat:Styled',
+  ':ui:actionbarcompat:SearchView',
+  ':ui:actionbarcompat:ShareActionProvider:ShareActionProvider',
+  ':ui:actionbarcompat:ShareActionProvider',
+  ':ui:actionbarcompat:ListViewModalSelect',
+  ':ui:actionbarcompat:Basic',
+  ':ui:actionbarcompat:Basic:Basic',
+  ':ui:actionbar:DoneBar',
+  ':ui:actionbar:DoneBar:DoneBar',
+  ':ui:accessibility:BasicAccessibility:BasicAccessibility',
+  ':ui:accessibility:BasicAccessibility',
+  ':ui:lists:CustomChoiceList:CustomChoiceList',
+  ':ui:lists:CustomChoiceList',
+  ':ui:views:TextSwitcher:TextSwitcher',
+  ':ui:views:TextSwitcher',
+  ':ui:views:HorizontalPaging:HorizontalPaging',
+  ':ui:views:HorizontalPaging',
+  ':ui:holo:BorderlessButtons:BorderlessButtons',
+  ':ui:holo:BorderlessButtons',
+  ':security:keystore:BasicAndroidKeyStore:BasicAndroidKeyStore',
+  ':security:keystore:BasicAndroidKeyStore',
+  ':views:TextLinkify:TextLinkify',
+  ':views:TextLinkify',
+  ':background:alarms:repeatingAlarm',
+  ':background:alarms:repeatingAlarm:repeatingAlarmSample',
+  ':media:BasicMediaRouter:BasicMediaRouter',
+  ':media:BasicMediaRouter',
+  ':media:BasicMediaDecoder:BasicMediaDecoder',
+  ':media:BasicMediaDecoder',
+  ':media:MediaRecorder:MediaRecorder',
+  ':media:MediaRecorder',
+  ':input:multitouch:BasicMultitouch:BasicMultitouch',
+  ':input:multitouch:BasicMultitouch',
+  ':input:gestures:BasicGestureDetect:BasicGestureDetect',
+  ':input:gestures:BasicGestureDetect')
diff --git a/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle b/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle
index 0baece9..10fb811 100644
--- a/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle
+++ b/ui/accessibility/BasicAccessibility/BasicAccessibility/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/actionbar/DoneBar/DoneBar/build.gradle b/ui/actionbar/DoneBar/DoneBar/build.gradle
index 945e1f5..9f4459b 100644
--- a/ui/actionbar/DoneBar/DoneBar/build.gradle
+++ b/ui/actionbar/DoneBar/DoneBar/build.gradle
@@ -2,5 +2,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/actionbar/DoneBar/build.xml b/ui/actionbar/DoneBar/build.xml
new file mode 100644
index 0000000..1f0d8a1
--- /dev/null
+++ b/ui/actionbar/DoneBar/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="SampleDashboardActivity" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/ui/actionbar/DoneBar/project.properties b/ui/actionbar/DoneBar/project.properties
new file mode 100644
index 0000000..a3ee5ab
--- /dev/null
+++ b/ui/actionbar/DoneBar/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17
diff --git a/ui/actionbarcompat/Basic/Basic/build.gradle b/ui/actionbarcompat/Basic/Basic/build.gradle
index 8e76487..82ea162 100644
--- a/ui/actionbarcompat/Basic/Basic/build.gradle
+++ b/ui/actionbarcompat/Basic/Basic/build.gradle
@@ -7,5 +7,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/actionbarcompat/ListPopupMenu/ListPopupMenu/build.gradle b/ui/actionbarcompat/ListPopupMenu/ListPopupMenu/build.gradle
index 8e76487..82ea162 100644
--- a/ui/actionbarcompat/ListPopupMenu/ListPopupMenu/build.gradle
+++ b/ui/actionbarcompat/ListPopupMenu/ListPopupMenu/build.gradle
@@ -7,5 +7,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/actionbarcompat/ListViewModalSelect/build.gradle b/ui/actionbarcompat/ListViewModalSelect/build.gradle
index b99b102..5161a84 100644
--- a/ui/actionbarcompat/ListViewModalSelect/build.gradle
+++ b/ui/actionbarcompat/ListViewModalSelect/build.gradle
@@ -1,3 +1,13 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
 apply plugin: 'android'
 
 dependencies {
@@ -7,7 +17,7 @@
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "17.0.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/ui/actionbarcompat/SearchView/build.gradle b/ui/actionbarcompat/SearchView/build.gradle
index b99b102..5161a84 100644
--- a/ui/actionbarcompat/SearchView/build.gradle
+++ b/ui/actionbarcompat/SearchView/build.gradle
@@ -1,3 +1,13 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
 apply plugin: 'android'
 
 dependencies {
@@ -7,7 +17,7 @@
 
 android {
     compileSdkVersion 17
-    buildToolsVersion "17.0.0"
+    buildToolsVersion "18.0.1"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/ui/actionbarcompat/ShareActionProvider/ShareActionProvider/build.gradle b/ui/actionbarcompat/ShareActionProvider/ShareActionProvider/build.gradle
index 8e76487..3538bea 100644
--- a/ui/actionbarcompat/ShareActionProvider/ShareActionProvider/build.gradle
+++ b/ui/actionbarcompat/ShareActionProvider/ShareActionProvider/build.gradle
@@ -1,3 +1,13 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
 apply plugin: 'android'
 
 dependencies {
@@ -7,5 +17,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/actionbarcompat/Styled/Styled/build.gradle b/ui/actionbarcompat/Styled/Styled/build.gradle
index 8e76487..3538bea 100644
--- a/ui/actionbarcompat/Styled/Styled/build.gradle
+++ b/ui/actionbarcompat/Styled/Styled/build.gradle
@@ -1,3 +1,13 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
 apply plugin: 'android'
 
 dependencies {
@@ -7,5 +17,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle b/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
index 945e1f5..9f4459b 100644
--- a/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
+++ b/ui/holo/BorderlessButtons/BorderlessButtons/build.gradle
@@ -2,5 +2,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle b/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
index 6083faa..3f765aa 100644
--- a/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
+++ b/ui/lists/CustomChoiceList/CustomChoiceList/build.gradle
@@ -3,5 +3,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/notifications/BasicNotifications/BasicNotifications/build.gradle b/ui/notifications/BasicNotifications/BasicNotifications/build.gradle
index 0baece9..10fb811 100644
--- a/ui/notifications/BasicNotifications/BasicNotifications/build.gradle
+++ b/ui/notifications/BasicNotifications/BasicNotifications/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/notifications/CustomNotifications/CustomNotifications/build.gradle b/ui/notifications/CustomNotifications/CustomNotifications/build.gradle
index 47fc855..a6f0afc 100644
--- a/ui/notifications/CustomNotifications/CustomNotifications/build.gradle
+++ b/ui/notifications/CustomNotifications/CustomNotifications/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0+'
+    compile 'com.android.support:support-v4:18.0.+'
 }
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/views/HorizontalPaging/HorizontalPaging/build.gradle b/ui/views/HorizontalPaging/HorizontalPaging/build.gradle
index 0baece9..10fb811 100644
--- a/ui/views/HorizontalPaging/HorizontalPaging/build.gradle
+++ b/ui/views/HorizontalPaging/HorizontalPaging/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/ui/views/TextSwitcher/TextSwitcher/build.gradle b/ui/views/TextSwitcher/TextSwitcher/build.gradle
index 0baece9..10fb811 100644
--- a/ui/views/TextSwitcher/TextSwitcher/build.gradle
+++ b/ui/views/TextSwitcher/TextSwitcher/build.gradle
@@ -6,5 +6,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }
diff --git a/views/TextLinkify/TextLinkify/build.gradle b/views/TextLinkify/TextLinkify/build.gradle
index 5bef5ee..ae56fea 100644
--- a/views/TextLinkify/TextLinkify/build.gradle
+++ b/views/TextLinkify/TextLinkify/build.gradle
@@ -14,5 +14,5 @@
 
 android {
     compileSdkVersion 18
-    buildToolsVersion "18.0.0"
+    buildToolsVersion "18.0.1"
 }