Auto-update

google-automerger · google-automerger · commit b51ebcacd841 · 2015-05-21T10:04:18.000-07:00
diff --git a/.google/packaging.yaml b/.google/packaging.yaml
@@ -1,3 +1,4 @@
+
 # GOOGLE SAMPLE PACKAGING DATA
 #
 # This file is used by Google as part of our samples packaging process.
diff --git a/Application/build.gradle b/Application/build.gradle
@@ -1,10 +1,11 @@
+
 buildscript {
     repositories {
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 
@@ -37,6 +38,11 @@ android {
         targetSdkVersion 21
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
     sourceSets {
         main {
             dirs.each { dir ->
diff --git a/Application/src/main/res/values-v21/base-colors.xml b/Application/src/main/res/values-v21/base-colors.xml
@@ -14,6 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
 <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
@@ -14,6 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
 <resources>
 
     <!-- Activity themes -->
diff --git a/Application/src/main/res/values/base-strings.xml b/Application/src/main/res/values/base-strings.xml
@@ -14,6 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
+
 <resources>
     <string name="app_name">Camera2Basic</string>
     <string name="intro_message">
diff --git a/NOTICE b/NOTICE
@@ -1,3 +1,4 @@
+
 This sample uses the following software:
 
 Copyright 2015 The Android Open Source Project
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+
 Android Camera2Basic Sample
 ===================================
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`# GOOGLE SAMPLE PACKAGING DATA`
`2`	`3`	`#`
`3`	`4`	`# This file is used by Google as part of our samples packaging process.`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
	`1`	`+`
`1`	`2`	`buildscript {`
`2`	`3`	`repositories {`
`3`	`4`	`jcenter()`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:1.0.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:1.1.0'`
`8`	`9`	`}`
`9`	`10`	`}`
`10`	`11`
`@@ -37,6 +38,11 @@ android {`
`37`	`38`	`targetSdkVersion 21`
`38`	`39`	`}`
`39`	`40`
	`41`	`+ compileOptions {`
	`42`	`+ sourceCompatibility JavaVersion.VERSION_1_7`
	`43`	`+ targetCompatibility JavaVersion.VERSION_1_7`
	`44`	`+ }`
	`45`	`+`
`40`	`46`	`sourceSets {`
`41`	`47`	`main {`
`42`	`48`	`dirs.each { dir ->`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`This sample uses the following software:`
`2`	`3`
`3`	`4`	`Copyright 2015 The Android Open Source Project`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`Android Camera2Basic Sample`
`2`	`3`	`===================================`
`3`	`4`