Update lmp-docs prebuilts

Synced to commit 444b6168f79915df2b028a48ea1bbe74a60b9967.

Change-Id: Id2697435062f9c626171319104d0507548475071

6 files changed, 12 insertions, 56 deletions

diff --git a/prebuilts/gradle/Quiz/Application/build.gradle b/prebuilts/gradle/Quiz/Application/build.gradle
index 1b090738..80aa1d03 100644
--- a/prebuilts/gradle/Quiz/Application/build.gradle
+++ b/prebuilts/gradle/Quiz/Application/build.gradle
@@ -14,10 +14,9 @@ apply plugin: 'com.android.application'
 dependencies {
 
 
-    compile 'com.google.android.gms:play-services:5.0.+'
-    compile 'com.android.support:support-v13:20.0.+'
+    compile 'com.google.android.gms:play-services:6.5.+'
+    compile 'com.android.support:support-v13:21.0.+'
     wearApp project(':Wearable')
-
 }
 
 // The sample build uses multiple directories to
@@ -31,10 +30,10 @@ List<String> dirs = [
 android {
     compileSdkVersion 21
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion "21.0.0"
 
     defaultConfig {
-        minSdkVersion 20
+        minSdkVersion 18
         targetSdkVersion 21
     }
 
diff --git a/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml
index ce721354..55b666f1 100644
--- a/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Quiz/Application/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.example.android.wearable.quiz" >
 
-    <uses-sdk android:minSdkVersion="19"
-              android:targetSdkVersion="19" />
+    <uses-sdk android:minSdkVersion="18"
+              android:targetSdkVersion="21" />
 
     <application
             android:allowBackup="true"
diff --git a/prebuilts/gradle/Quiz/Shared/src/main/AndroidManifest.xml b/prebuilts/gradle/Quiz/Shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 04274562..00000000
--- a/prebuilts/gradle/Quiz/Shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.quiz.common">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/Quiz/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/Quiz/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb907..00000000
--- a/prebuilts/gradle/Quiz/Shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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>
-    <string name="app_name">Shared</string>
-</resources>
diff --git a/prebuilts/gradle/Quiz/Wearable/build.gradle b/prebuilts/gradle/Quiz/Wearable/build.gradle
index 483928f6..2f6c2c22 100644
--- a/prebuilts/gradle/Quiz/Wearable/build.gradle
+++ b/prebuilts/gradle/Quiz/Wearable/build.gradle
@@ -13,9 +13,9 @@ apply plugin: 'com.android.application'
 
 
 dependencies {
-    compile 'com.google.android.gms:play-services-wearable:5.0.+'
-    compile 'com.android.support:support-v13:20.0.+'
-    compile 'com.google.android.support:wearable:1.0.+'
+    compile 'com.google.android.gms:play-services-wearable:6.5.+'
+    compile 'com.android.support:support-v13:21.0.+'
+    compile 'com.google.android.support:wearable:1.1.+'
 }
 
 // The sample build uses multiple directories to
@@ -27,9 +27,9 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 'android-20'
+    compileSdkVersion 21
 
-    buildToolsVersion  "21.0.0"
+    buildToolsVersion "21.0.0"
 
     buildTypes {
         release {
diff --git a/prebuilts/gradle/Quiz/Wearable/src/main/AndroidManifest.xml b/prebuilts/gradle/Quiz/Wearable/src/main/AndroidManifest.xml
index fd20def8..fbc74922 100644
--- a/prebuilts/gradle/Quiz/Wearable/src/main/AndroidManifest.xml
+++ b/prebuilts/gradle/Quiz/Wearable/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
 
 
     <uses-sdk android:minSdkVersion="20"
-              android:targetSdkVersion="20" />
+              android:targetSdkVersion="21" />
 
     <uses-feature android:name="android.hardware.type.watch" />