diff --git a/.google/packaging.yaml b/.google/packaging.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8a4f8748a7ca7675266ee88cc9de8184adb443bd
--- /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:   [Media]
+languages:    [Java]
+solutions:    [Mobile]
+github:       android-Camera2Video
+license: apache2
diff --git a/Application/build.gradle b/Application/build.gradle
index a12b88457d7fa432e2782edb44852d521fd5f550..0f2f2d936b4da459f62cb1a3bf73092407cbc301 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 {
 
@@ -29,7 +33,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 0000000000000000000000000000000000000000..34c9cd138647257ef46ab8b2dec2db125ec1c0e0
--- /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 0000000000000000000000000000000000000000..0b2948f7e44b093057158f5aa35a3abe0b85a1a7
--- /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 134fcd9d39a5dc8be041bace606e73e2e20ec72b..0000000000000000000000000000000000000000
--- 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 14a4fcffab17bca22a192de49d22993e81857aff..faa8b5c68f00e5472421ffa27503da611782f4c0 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 543d7cda6a7b8a9a76abfbd7da124aa030c4ed10..7af303136ada9904367f65480154bb0ed53fb121 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 Android Camera2Video Sample
-==============================
+===================================
 
 This sample demonstrates how to record video using Camera2 API.
 
 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
@@ -40,7 +40,7 @@ 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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7f03cfe2d8fc114ccc5b62b85e5e377147e5ce3..0c71e760dc93830dd3411fe50d6f5c86bf0a8f4d 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip