summaryrefslogtreecommitdiffstats
path: root/docs/html/preview
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-10-17 08:32:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-17 08:32:20 +0000
commit8adb5fd14dae51faeb5b85b8cbcfc0930094e73f (patch)
tree6deb883f5ee56c5b3c5b4ce8543690ee7ca9cae3 /docs/html/preview
parentf19f639773e64289ed7345b8a1ea4dd244aa4882 (diff)
parentf7a7d6de7a171cc9d8efd635a241fb3ec809cbf6 (diff)
downloadframeworks_base-8adb5fd14dae51faeb5b85b8cbcfc0930094e73f.zip
frameworks_base-8adb5fd14dae51faeb5b85b8cbcfc0930094e73f.tar.gz
frameworks_base-8adb5fd14dae51faeb5b85b8cbcfc0930094e73f.tar.bz2
Merge "fix links on preview page" into lmp-dev
Diffstat (limited to 'docs/html/preview')
-rw-r--r--docs/html/preview/index.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/preview/index.html b/docs/html/preview/index.html
index f18558c..8d7fb8c 100644
--- a/docs/html/preview/index.html
+++ b/docs/html/preview/index.html
@@ -312,7 +312,7 @@ you should update now to test your apps and take advantage of new features.</p>
<li><a href="http://android-developers.blogspot.com/">Android 5.0 announcement</a></li>
<li><a href="/about/versions/android-5.0.html">Android 5.0 API Overview</a></li>
<li><a href="/sdk/api_diff/21/changes.html">Android 5.0 API Diff Report</a></li>
- <li><a href="/samples/index.html">Android 5.0 API Samples</a></li>
+ <li><a href="/samples/new/index.html">Android 5.0 API Samples</a></li>
</ul>
</div>
</div>
@@ -539,7 +539,7 @@ the recommendations in <a href="/training/tv/games/index.html">Building TV Games
</ul>
<p>You should also take advantage of the <a
- href="/tools/support-library/features.html#v17">v17 leanback library</a>, which
+ href="/tools/support-library/features.html#v17-leanback">v17 leanback library</a>, which
provides the <a href="/reference/android/support/v17/leanback/R.style.html#Theme_Leanback"
><code>Leanback</code></a> theme shown above, plus several widgets designed to
make your UI beautiful and easy to navigate on the big screen, such as a widget that creates