summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorJaewan Kim <jaewan@google.com>2015-08-25 01:40:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-25 01:40:11 +0000
commit29b588a3b738f2bcfb572fdfe541bba19374e44b (patch)
tree91c62d881c447843bfe248ea4543e78cabfbc5b9 /docs/html
parentd7f3dfb7c8f40308a95a56f90ef7a1157897cce6 (diff)
parentee93161369ca8c2c3d89825a1f5c8f93bc56c79c (diff)
downloadframeworks_base-29b588a3b738f2bcfb572fdfe541bba19374e44b.zip
frameworks_base-29b588a3b738f2bcfb572fdfe541bba19374e44b.tar.gz
frameworks_base-29b588a3b738f2bcfb572fdfe541bba19374e44b.tar.bz2
Merge "Add documentation for media router's palette dependency." into mnc-ub-dev
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/tools/support-library/features.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/tools/support-library/features.jd b/docs/html/tools/support-library/features.jd
index b3af7a2..19f93e9 100644
--- a/docs/html/tools/support-library/features.jd
+++ b/docs/html/tools/support-library/features.jd
@@ -307,8 +307,8 @@ libraries in your build path when setting up your project. For more information
on how to set up your project, follow the instructions in <a
href="{@docRoot}tools/support-library/setup.html#libs-with-res">Adding libraries
with resources</a>. If you are developing in Eclipse/ADT, make sure to include
-both the <code>android-support-v7-mediarouter.jar</code> and
-<code>android-support-v7-appcompat.jar</code> files.</p>
+the <code>android-support-v7-mediarouter.jar</code>, <code>android-support-v7-appcompat.jar</code>,
+and <code>android-support-v7-palette.jar</code> files.</p>
<p>If you are using Android Studio, all you need to do is specify the Gradle build
script dependency identifier <code>com.android.support:support-v7-mediarouter:&lt;revision&gt;</code>,