Merge changes Id4b68017,Ibee9b52a,I02e0292c,Ib765c9d5,I55577dae, ... into nyc-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-release

* changes:
  samples:  Remove duplicate comment from ActionBarCompat-ShareActionProvider
  samples: Remove support lib v4/v13 from DirectBoot
  samples: Change support lib from v24.0.0-beta1 to v24.0.0
  samples: Add global build targets for tests
  samples: Bump minSdk for TextLinkify
  samples: Bump minSdk for TextSwitcher
  samples: Bump minSdk for CustomChoiceList
  samples: Bump minSdk for ActivityInstrumentation
  samples: Remove attrs.xml from RenderScript samples
  samples: Remove duplicate appcompat-v7 declarations
  samples: Bump minSdk for BasicNetworking
  samples: Remove BasicSyncAdapter's attrs.xml file
  samples: Add 'assembleDebug' as a task in global build.gradle

29 files changed, 32 insertions, 96 deletions

diff --git a/build.gradle b/build.gradle
index b84829d1..6b1369ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,7 +121,11 @@ List<String> samples = [
 List<String> taskNames = [
     "clean",
     "refresh",
+    "assembleDebug",
     "build",
+    "check",
+    "connectedCheck",
+    "deviceCheck",
     "emitAnt",
     "emitGradle",
     "emitBrowseable",
diff --git a/connectivity/network/BasicNetworking/template-params.xml b/connectivity/network/BasicNetworking/template-params.xml
index efdabbdc..a59c6f92 100644
--- a/connectivity/network/BasicNetworking/template-params.xml
+++ b/connectivity/network/BasicNetworking/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.basicnetworking</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml b/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index 6c155046..00000000
--- a/connectivity/sync/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,21 +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.
--->
-
-<resources>
-    <!-- Specifies a style resource to use for an indeterminate progress spinner. -->
-    <attr name="indeterminateProgressStyle" format="reference"/>
-</resources>
\ No newline at end of file
diff --git a/content/documentsUi/ScopedDirectoryAccess/template-params.xml b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
index d008782b..81161162 100644
--- a/content/documentsUi/ScopedDirectoryAccess/template-params.xml
+++ b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
@@ -26,9 +26,8 @@
     <targetSdkVersion>24</targetSdkVersion>
 
     <!-- Include additional dependencies here.-->
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:support-v4:24.0.0</dependency>
 
     <template src="base" />
 
diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml
index 7b42427a..905ba7f3 100644
--- a/media/Camera2Basic/template-params.xml
+++ b/media/Camera2Basic/template-params.xml
@@ -22,7 +22,6 @@
     <group>Media</group>
     <package>com.example.android.camera2basic</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
     <minSdk>21</minSdk>
     <strings>
         <intro>
diff --git a/media/Camera2Raw/template-params.xml b/media/Camera2Raw/template-params.xml
index b33ebf1f..e0072c76 100644
--- a/media/Camera2Raw/template-params.xml
+++ b/media/Camera2Raw/template-params.xml
@@ -20,7 +20,6 @@
     <group>Media</group>
     <package>com.example.android.camera2raw</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
     <minSdk>21</minSdk>
 
     <strings>
diff --git a/media/Camera2Video/template-params.xml b/media/Camera2Video/template-params.xml
index 19e34703..6b769002 100644
--- a/media/Camera2Video/template-params.xml
+++ b/media/Camera2Video/template-params.xml
@@ -20,7 +20,6 @@
     <group>Media</group>
     <package>com.example.android.camera2video</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
     <minSdk>21</minSdk>
 
     <strings>
diff --git a/media/HdrViewfinder/template-params.xml b/media/HdrViewfinder/template-params.xml
index bac09925..d63c0992 100644
--- a/media/HdrViewfinder/template-params.xml
+++ b/media/HdrViewfinder/template-params.xml
@@ -21,7 +21,7 @@
 
     <minSdk>21</minSdk>
 
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/media/MediaRouter/template-params.xml b/media/MediaRouter/template-params.xml
index 5f2a5632..647c487a 100644
--- a/media/MediaRouter/template-params.xml
+++ b/media/MediaRouter/template-params.xml
@@ -27,8 +27,7 @@
     <!-- change minSdk if needed-->
     <minSdk>13</minSdk>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:mediarouter-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:mediarouter-v7:24.0.0</dependency>
 
 
     <strings>
diff --git a/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml b/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index e67df0a3..00000000
--- a/renderScript/BasicRenderScript/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
diff --git a/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
deleted file mode 100644
index e67df0a3..00000000
--- a/renderScript/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
-    <!--
-         Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels.
-    -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="buttonBarStyle" format="reference" />
-        <attr name="buttonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
diff --git a/security/DirectBoot/template-params.xml b/security/DirectBoot/template-params.xml
index ec45fcfd..dd5d5b1f 100644
--- a/security/DirectBoot/template-params.xml
+++ b/security/DirectBoot/template-params.xml
@@ -27,11 +27,8 @@
 
     <!-- Include additional dependencies here.-->
     <!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v13:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <template src="base" />
 
diff --git a/system/RuntimePermissions/template-params.xml b/system/RuntimePermissions/template-params.xml
index a12be33e..c766f9bd 100644
--- a/system/RuntimePermissions/template-params.xml
+++ b/system/RuntimePermissions/template-params.xml
@@ -21,9 +21,8 @@
 
     <minSdk>15</minSdk>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:support-v4:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/system/RuntimePermissionsBasic/template-params.xml b/system/RuntimePermissionsBasic/template-params.xml
index 89000913..c5852ed8 100644
--- a/system/RuntimePermissionsBasic/template-params.xml
+++ b/system/RuntimePermissionsBasic/template-params.xml
@@ -21,9 +21,8 @@
 
     <minSdk>15</minSdk>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:support-v4:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/testing/ActivityInstrumentation/template-params.xml b/testing/ActivityInstrumentation/template-params.xml
index 4856a82d..1e248d5d 100644
--- a/testing/ActivityInstrumentation/template-params.xml
+++ b/testing/ActivityInstrumentation/template-params.xml
@@ -21,7 +21,7 @@
 
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
 
     <strings>
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
index 5c655952..ffb0de54 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
@@ -19,8 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.basic</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml
index acb2c3ac..930a2936 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/template-params.xml
@@ -19,8 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.listpopupmenu</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
index 4d95c7b2..76d316a9 100644
--- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/template-params.xml
@@ -19,9 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.shareactionprovider</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
-    <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
     <strings>
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
index 7952b5f9..4e0c8e7e 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
@@ -19,8 +19,6 @@
     <group>UI</group>
     <package>com.example.android.actionbarcompat.styled</package>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
 
diff --git a/ui/lists/CustomChoiceList/template-params.xml b/ui/lists/CustomChoiceList/template-params.xml
index 35626fc3..d42ba2b8 100644
--- a/ui/lists/CustomChoiceList/template-params.xml
+++ b/ui/lists/CustomChoiceList/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.customchoicelist</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/ui/views/CardView/template-params.xml b/ui/views/CardView/template-params.xml
index 30ff32f7..3ce856f3 100644
--- a/ui/views/CardView/template-params.xml
+++ b/ui/views/CardView/template-params.xml
@@ -27,7 +27,7 @@
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
 
-    <dependency>com.android.support:cardview-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:cardview-v7:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/ui/views/NavigationDrawer/template-params.xml b/ui/views/NavigationDrawer/template-params.xml
index 12ea60ac..b33af7cf 100644
--- a/ui/views/NavigationDrawer/template-params.xml
+++ b/ui/views/NavigationDrawer/template-params.xml
@@ -27,10 +27,10 @@
     <!-- change minSdk if needed-->
     <minSdk>21</minSdk>
 
-    <dependency>com.android.support:support-v13:24.0.0-beta1</dependency>
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:cardview-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:support-v13:24.0.0</dependency>
+    <dependency>com.android.support:appcompat-v7:24.0.0</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:cardview-v7:24.0.0</dependency>
 
     <strings>
         <intro>
diff --git a/ui/views/RecyclerView/template-params.xml b/ui/views/RecyclerView/template-params.xml
index 262fb179..2634a071 100644
--- a/ui/views/RecyclerView/template-params.xml
+++ b/ui/views/RecyclerView/template-params.xml
@@ -22,7 +22,7 @@
     <group>UI</group>
     <package>com.example.android.recyclerview</package>
 
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
 
     <!-- change minSdk if needed-->
     <minSdk>7</minSdk>
diff --git a/ui/views/TextSwitcher/template-params.xml b/ui/views/TextSwitcher/template-params.xml
index f29e2cd1..b57e2283 100644
--- a/ui/views/TextSwitcher/template-params.xml
+++ b/ui/views/TextSwitcher/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.textswitcher</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/views/TextLinkify/template-params.xml b/views/TextLinkify/template-params.xml
index 72c34370..de4d5f72 100644
--- a/views/TextLinkify/template-params.xml
+++ b/views/TextLinkify/template-params.xml
@@ -21,7 +21,7 @@
     <package>com.example.android.textlinkify</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>7</minSdk>
 
     <strings>
         <intro>
diff --git a/wearable/wear/AgendaData/template-params.xml b/wearable/wear/AgendaData/template-params.xml
index e1dea3b9..0114403b 100644
--- a/wearable/wear/AgendaData/template-params.xml
+++ b/wearable/wear/AgendaData/template-params.xml
@@ -26,7 +26,7 @@
     <targetSdkVersion>23</targetSdkVersion>
     <targetSdkVersionWear>23</targetSdkVersionWear>
 
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <wearable>
         <has_handheld_app>true</has_handheld_app>
diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml
index a197fec0..cdbeef7b 100644
--- a/wearable/wear/RuntimePermissionsWear/template-params.xml
+++ b/wearable/wear/RuntimePermissionsWear/template-params.xml
@@ -28,8 +28,8 @@
         <has_handheld_app>true</has_handheld_app>
     </wearable>
 
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:appcompat-v7:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
     <provided_dependency_wearable>com.google.android.wearable:wearable:1.4.0</provided_dependency_wearable>
 
     <strings>
diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml
index b4e3d447..93c88f82 100644
--- a/wearable/wear/SpeedTracker/template-params.xml
+++ b/wearable/wear/SpeedTracker/template-params.xml
@@ -30,7 +30,7 @@
         <has_handheld_app>true</has_handheld_app>
     </wearable>
 
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
 
     <dependency>com.google.android.gms:play-services-location</dependency>
     <dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable>
diff --git a/wearable/wear/XYZTouristAttractions/template-params.xml b/wearable/wear/XYZTouristAttractions/template-params.xml
index 59239cab..35de8384 100644
--- a/wearable/wear/XYZTouristAttractions/template-params.xml
+++ b/wearable/wear/XYZTouristAttractions/template-params.xml
@@ -29,9 +29,9 @@
     <dependency>com.google.android.gms:play-services-location</dependency>
     <dependency>com.google.maps.android:android-maps-utils:0.3.4</dependency>
     <dependency>com.github.bumptech.glide:glide:3.6.1</dependency>
-    <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
-    <dependency>com.android.support:design:24.0.0-beta1</dependency>
+    <dependency>com.android.support:appcompat-v7:24.0.0</dependency>
+    <dependency>com.android.support:recyclerview-v7:24.0.0</dependency>
+    <dependency>com.android.support:design:24.0.0</dependency>
     <dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable>
     <dependency_shared>com.android.support:support-v13:23.0.0</dependency_shared>
     <dependency_shared>com.google.android.gms:play-services-wearable</dependency_shared>