summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-08-07 22:04:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-07 22:04:02 +0000
commita4ef5a3aaafddc1e11a87290c42397748aa9358d (patch)
tree76ec2d3c3de415b699cb600c5042f27cdc826766 /docs/html/tools
parent8f16c0655eb4e7321f346ed62d9068ebc9fdc35b (diff)
parenta1c9af2438c3b06f190ad9094160e01df395bec2 (diff)
downloadframeworks_base-a4ef5a3aaafddc1e11a87290c42397748aa9358d.zip
frameworks_base-a4ef5a3aaafddc1e11a87290c42397748aa9358d.tar.gz
frameworks_base-a4ef5a3aaafddc1e11a87290c42397748aa9358d.tar.bz2
am a1c9af24: am 6f273458: Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs
* commit 'a1c9af2438c3b06f190ad9094160e01df395bec2': docs: remove "developer preview" and point to Android-specific doc
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/support-library/features.jd8
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/html/tools/support-library/features.jd b/docs/html/tools/support-library/features.jd
index 65148bf..78946ee 100644
--- a/docs/html/tools/support-library/features.jd
+++ b/docs/html/tools/support-library/features.jd
@@ -225,8 +225,7 @@ com.android.support:gridlayout-v7:18.0.+
<p>This library provides {@link android.support.v7.media.MediaRouter}, {@link
android.support.v7.media.MediaRouteProvider}, and related media classes that
-support the <a href="https://developers.google.com/cast/">Google Cast
-developer preview</a>. </p>
+support <a href="https://developers.google.com/cast/docs/android_sender">Google Cast</a>. </p>
<p>In general, the APIs in the v7 mediarouter library provide a means of
controlling the routing of media channels and streams from the current device to
@@ -258,9 +257,8 @@ com.android.support:mediarouter-v7:18.0.+
<p class="caution">The v7 mediarouter library APIs introduced in Support Library
r18 are subject to change in later revisions of the Support Library. At this
-time, we recommend using the library only in connection with the <a
-href="https://developers.google.com/cast/">Google Cast
-developer preview</a>. </p>
+time, we recommend using the library only in connection with <a
+href="https://developers.google.com/cast/docs/android_sender">Google Cast</a>. </p>
<h2 id="v8">v8 Support Library</h2>