Auto-update

google-automerger · google-automerger · commit b24fc445850f · 2015-03-30T17:43:18.000-07:00
diff --git a/Application/build.gradle b/Application/build.gradle
@@ -14,13 +14,10 @@ repositories {
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@ List<String> dirs = [
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/Application/src/main/res/layout/activity_main.xml b/Application/src/main/res/layout/activity_main.xml
diff --git a/Application/tests/AndroidManifest.xml b/Application/tests/AndroidManifest.xml
@@ -1,22 +1,3 @@
-<?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.
--->
-
-
-
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2013 The Android Open Source Project
@@ -56,4 +37,4 @@
             android:targetPackage="com.example.android.camera2basic"
             android:label="Tests for com.example.android.camera2basic" />
 
-</manifest>
+</manifest>
diff --git a/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java b/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
@@ -1,21 +1,3 @@
-/*
-* 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.
-*/
-
-
-
 /*
 * Copyright (C) 2013 The Android Open Source Project
 *
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<CameraActivity> {
 
     private CameraActivity mTestActivity;
-    private Camera2BasicFragment mTestFragment;
 
     public SampleTests() {
         super(CameraActivity.class);
@@ -58,8 +39,6 @@ protected void setUp() throws Exception {
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (Camera2BasicFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@ public void testPreconditions() {
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
+}
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Pre-requisites
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
