From ffbc6d7591a3e614653369cd56efda270a6f691a Mon Sep 17 00:00:00 2001
From: google-automerger <automerger@google.com>
Date: Wed, 3 Dec 2014 01:50:23 -0800
Subject: [PATCH] Auto-update

---
 .google/packaging.yaml                        | 12 ++++++++++
 Application/build.gradle                      | 10 +++++---
 .../src/main/res/values-v21/base-colors.xml   | 20 ++++++++++++++++
 .../res/values-v21/base-template-styles.xml   | 23 +++++++++++++++++++
 .../main/res/values-v21/template-styles.xml   | 22 ------------------
 CONTRIB.md => CONTRIBUTING.md                 |  4 ++--
 README.md                                     | 17 +++++++-------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 8 files changed, 74 insertions(+), 36 deletions(-)
 create mode 100644 .google/packaging.yaml
 create mode 100644 Application/src/main/res/values-v21/base-colors.xml
 create mode 100644 Application/src/main/res/values-v21/base-template-styles.xml
 delete mode 100644 Application/src/main/res/values-v21/template-styles.xml
 rename CONTRIB.md => CONTRIBUTING.md (92%)

diff --git a/.google/packaging.yaml b/.google/packaging.yaml
new file mode 100644
index 0000000..e5dc053
--- /dev/null
+++ b/.google/packaging.yaml
@@ -0,0 +1,12 @@
+# GOOGLE SAMPLE PACKAGING DATA
+#
+# This file is used by Google as part of our samples packaging process.
+# End users may safely ignore this file. It has no relevance to other systems.
+---
+status:       PUBLISHED
+technologies: [Android]
+categories:   [UI]
+languages:    [Java]
+solutions:    [Mobile]
+github:       android-CardView Sample
+license: apache2
diff --git a/Application/build.gradle b/Application/build.gradle
index 6b9dc06..26ea951 100644
--- a/Application/build.gradle
+++ b/Application/build.gradle
@@ -1,15 +1,19 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc1'
     }
 }
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+}
+
 
 dependencies {
 
@@ -27,7 +31,7 @@ List<String> dirs = [
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.0.0"
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/Application/src/main/res/values-v21/base-colors.xml b/Application/src/main/res/values-v21/base-colors.xml
new file mode 100644
index 0000000..34c9cd1
--- /dev/null
+++ b/Application/src/main/res/values-v21/base-colors.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<resources>
+
+
+</resources>
diff --git a/Application/src/main/res/values-v21/base-template-styles.xml b/Application/src/main/res/values-v21/base-template-styles.xml
new file mode 100644
index 0000000..0b2948f
--- /dev/null
+++ b/Application/src/main/res/values-v21/base-template-styles.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<resources>
+
+    <!-- Activity themes -->
+    <style name="Theme.Base" parent="android:Theme.Material.Light">
+    </style>
+
+</resources>
diff --git a/Application/src/main/res/values-v21/template-styles.xml b/Application/src/main/res/values-v21/template-styles.xml
deleted file mode 100644
index 134fcd9..0000000
--- a/Application/src/main/res/values-v21/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2014 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.Material.Light" />
-
-</resources>
diff --git a/CONTRIB.md b/CONTRIBUTING.md
similarity index 92%
rename from CONTRIB.md
rename to CONTRIBUTING.md
index 14a4fcf..faa8b5c 100644
--- a/CONTRIB.md
+++ b/CONTRIBUTING.md
@@ -9,10 +9,10 @@ Please fill out either the individual or corporate Contributor License Agreement
 
   * If you are an individual writing original source code and you're sure you
     own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://developers.google.com/open-source/cla/individual).
+    (https://cla.developers.google.com).
   * If you work for a company that wants to allow you to contribute your work,
     then you'll need to sign a [corporate CLA]
-    (https://developers.google.com/open-source/cla/corporate).
+    (https://cla.developers.google.com).
 
 Follow either of the two links above to access the appropriate CLA and
 instructions for how to sign and return it. Once we receive it, we'll be able to
diff --git a/README.md b/README.md
index afa2483..9b59602 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,14 @@
-Android CardView Sample
-=======================
+Android CardView Sample Sample
+===================================
 
-Demonstration of the CardView API introduced in Android L.
+This sample demonstrates how to use CardView introduced in the support library for the
+Android L preview.
 
 Pre-requisites
 --------------
 
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
+- Android SDK v21
+- Android Build Tools v21.1.1
 - Android Support Repository
 
 Getting Started
@@ -23,7 +24,7 @@ Support
 - Stack Overflow: http://stackoverflow.com/questions/tagged/android
 
 If you've found an error in this sample, please file an issue:
-https://github.com/googlesamples/android-BasicAndroidKeyStore
+https://github.com/googlesamples/android-CardView Sample
 
 Patches are encouraged, and may be submitted by forking this project and
 submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
@@ -40,8 +41,8 @@ file to you 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
-  
+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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 588fabb..78c4ddd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip