Auto-update

Author: google-automerger

Camera2BasicSample/build.gradle Application/build.gradleCamera2BasicSample/build.gradle renamed to Application/build.gradle

@@ -1,6 +1,3 @@
-
-
-
 buildscript {
     repositories {
         mavenCentral()
@@ -11,13 +8,14 @@ buildscript {
     }
 }
 
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 
 dependencies {
 
-    compile "com.android.support:support-v4:20.+"
-    compile "com.android.support:support-v13:20.+"
+    compile "com.android.support:support-v4:21.+"
+    compile "com.android.support:support-v13:21.+"
+    compile "com.android.support:cardview-v7:21.+"
 
 }
 
@@ -30,9 +28,13 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion "android-L"
+    compileSdkVersion 21
+    buildToolsVersion "21.0.0"
 
-    buildToolsVersion "20.0.0"
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 21
+    }
 
     sourceSets {
         main {

…BasicSample/src/main/AndroidManifest.xml Application/src/main/AndroidManifest.xmlCamera2BasicSample/src/main/AndroidManifest.xml renamed to Application/src/main/AndroidManifest.xml Camera2BasicSample/src/main/AndroidManifest.xml renamed to Application/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
     android:versionCode="1"
     android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="L" android:targetSdkVersion="L" />
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
     <uses-permission android:name="android.permission.CAMERA" />
 
     <application android:allowBackup="true"