summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-08-07 21:59:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-07 21:59:43 +0000
commita1c9af2438c3b06f190ad9094160e01df395bec2 (patch)
tree3297f8f58e1a05ba73881d17a6708a2b43bccc3a /docs
parent35b08bacc4e4ab937a5179b5b991f6509127f517 (diff)
parent6f273458fb9de10e07f5876e85f9f80592bf52b2 (diff)
downloadframeworks_base-a1c9af2438c3b06f190ad9094160e01df395bec2.zip
frameworks_base-a1c9af2438c3b06f190ad9094160e01df395bec2.tar.gz
frameworks_base-a1c9af2438c3b06f190ad9094160e01df395bec2.tar.bz2
am 6f273458: Merge "docs: remove "developer preview" and point to Android-specific doc" into klp-modular-docs
* commit '6f273458fb9de10e07f5876e85f9f80592bf52b2': docs: remove "developer preview" and point to Android-specific doc
Diffstat (limited to 'docs')
-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>