From f592a58744018bea778a4938b225eb65fc5a6216 Mon Sep 17 00:00:00 2001
From: Rich Slogar <rslogar@google.com>
Date: Fri, 7 Nov 2014 15:56:21 -0800
Subject: docs support library updates [CP]

Change-Id: Ic8c5c4e176618c245211e59000dd72c2af6b1e79
(cherry picked from commit aae10bae71e8709e1b903ae57b89d956b57c9fd6)
---
 docs/html/tools/support-library/features.jd | 31 ++++++++++++++++++++---------
 docs/html/tools/support-library/setup.jd    | 26 ++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/docs/html/tools/support-library/features.jd b/docs/html/tools/support-library/features.jd
index 3ebfc8989fc8..079dd718c1f4 100644
--- a/docs/html/tools/support-library/features.jd
+++ b/docs/html/tools/support-library/features.jd
@@ -137,13 +137,16 @@ page.title=Support Library Features
   <a href="{@docRoot}tools/support-library/setup.html#libs-without-res">Adding libraries without
   resources</a>.</p>
 
+<p class="caution"><strong>Caution:</strong> Using dynamic dependencies, especially for higher version
+numbers, can cause unexpected version updates and regression incompatibilities.</p>
+
 <p>The Gradle build script dependency identifier for this library is as follows:</p>
 
 <pre>
 com.android.support:support-v4:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
 
 
 <h2 id="multidex">Multidex Support Library</h2>
@@ -171,7 +174,7 @@ com.android.support:support-v4:21.0.+
 com.android.support:multidex:1.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 1.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 1.0 prefix.</p>
 
 
 <h2 id="v7">v7 Support Libraries</h2>
@@ -226,7 +229,8 @@ com.android.support:multidex:1.0.+
 com.android.support:appcompat-v7:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
+
 
 <h3 id="v7-cardview">v7 cardview library</h3>
 
@@ -248,7 +252,8 @@ libraries with resources</a>.</p>
 com.android.support:cardview-v7:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
+
 
 <h3 id="v7-gridlayout">v7 gridlayout library</h3>
 
@@ -269,7 +274,7 @@ com.android.support:cardview-v7:21.0.+
 com.android.support:gridlayout-v7:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
 
 
 <h3 id="v7-mediarouter">v7 mediarouter library</h3>
@@ -333,7 +338,9 @@ title card.</p>
 com.android.support:palette-v7:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
+
+
 
 <h3 id="v7-recyclerview">v7 recyclerview library</h3>
 
@@ -356,7 +363,9 @@ libraries with resources</a>.</p>
 com.android.support:recyclerview-v7:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
+
+
 
 <h2 id="v8">v8 Support Library</h2>
 
@@ -399,7 +408,9 @@ com.android.support:recyclerview-v7:21.0.+
 com.android.support:support-v13:18.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 18.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 18.0 prefix.</p>
+
+
 
 <h2 id="v17-leanback">v17 Leanback Library</h2>
 
@@ -440,4 +451,6 @@ with resources</a>. </p>
 com.android.support:leanback-v17:21.0.+
 </pre>
 
-<p>This dependency notation specifies the release version 21.0.0 or higher.</p>
+<p>This dependency notation specifies the latest release version with the 21.0 prefix.</p>
+
+
diff --git a/docs/html/tools/support-library/setup.jd b/docs/html/tools/support-library/setup.jd
index 2325a1387235..845cf76563fd 100644
--- a/docs/html/tools/support-library/setup.jd
+++ b/docs/html/tools/support-library/setup.jd
@@ -293,8 +293,30 @@ dependencies {
       android:targetSdkVersion="17" /&gt;
 </pre>
 
-<p>This change tells Google Play that your application can be installed on devices with Android
-  2.1 (API level 7) and higher.</p>
+<p>The manifest setting tells Google Play that your application can be installed on devices with Android
+  2.1 (API level 7) and higher.  </p>
+
+<p>If you are using Gradle build files, the <code>minSdkVersion</code> setting in the build file
+  overrides the manifest settings.  </p>
+
+<pre>
+apply plugin: 'android'
+
+android {
+    ...
+
+    defaultConfig {
+        minSdkVersion 8
+        ...
+    }
+    ...
+}
+</pre>
+
+<p>In this case, the build file setting tells Google Play that the default build variant of your
+  application can be installed on devices with Android 2.2 (API level 8) and higher. For more
+  information about build variants, see
+  <a href="{@docRoot}sdk/installing/studio-build.html">Build System Overview</a>. </p>
 
 <p class="note">
   <strong>Note:</strong> If you are including the v4 support and v7 appcompat libraries in your
-- 
cgit v1.2.3-59-g8ed1b