diff options
| author | Scott Main <smain@google.com> | 2013-02-06 20:14:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-06 20:14:49 +0000 |
| commit | 00f490844d89b146e5490204a5a483834950c489 (patch) | |
| tree | d79cfd3359de6663bfd9f07ceaabfb37477cda93 /docs | |
| parent | d6e0c147175708bcc02813fc0f4008179e95b9e7 (diff) | |
| parent | b47fa1699a02a96d5da8e175966e9584c6bd5565 (diff) | |
| download | frameworks_base-00f490844d89b146e5490204a5a483834950c489.zip frameworks_base-00f490844d89b146e5490204a5a483834950c489.tar.gz frameworks_base-00f490844d89b146e5490204a5a483834950c489.tar.bz2 | |
Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/about/versions/android-3.0.jd | 2 | ||||
| -rw-r--r-- | docs/html/sitemap.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/about/versions/android-3.0.jd b/docs/html/about/versions/android-3.0.jd index 68ac03a..d0b41d3 100644 --- a/docs/html/about/versions/android-3.0.jd +++ b/docs/html/about/versions/android-3.0.jd @@ -571,7 +571,7 @@ as a special, platform-independent shader language for maximum performance. Usin can accelerate graphics operations and data processing. Renderscript is an ideal way to create high-performance 3D effects for applications, wallpapers, carousels, and more.</p> <p>For more information, see the <a -href="{@docRoot}guide/topics/graphics/renderscript.html">3D Rendering and Computation with +href="{@docRoot}guide/topics/renderscript/index.html">3D Rendering and Computation with Renderscript</a> documentation.</p></li> </ul> diff --git a/docs/html/sitemap.txt b/docs/html/sitemap.txt index 3248b7d..105f60d 100644 --- a/docs/html/sitemap.txt +++ b/docs/html/sitemap.txt @@ -2611,7 +2611,7 @@ http://developer.android.com/reference/android/inputmethodservice/Keyboard.html http://developer.android.com/reference/android/support/v4/view/PagerTabStrip.html http://developer.android.com/reference/android/support/v4/view/PagerTitleStrip.html http://developer.android.com/reference/android/renderscript/RSSurfaceView.html -http://developer.android.com/guide/topics/graphics/renderscript.html +http://developer.android.com/guide/topics/renderscript/index.html http://developer.android.com/reference/android/renderscript/RSTextureView.html http://developer.android.com/reference/android/appwidget/AppWidgetHost.html http://developer.android.com/reference/javax/xml/XMLConstants.html |