diff options
| author | Joe Fernandez <joefernandez@google.com> | 2012-02-09 13:45:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-09 13:45:01 -0800 |
| commit | 1c66faab73b2ce54bfe362f3c051ce95ed89fb22 (patch) | |
| tree | cd8fbd22364a9b0adf705117a3f9fbf6522bd8be /docs/html/resources | |
| parent | 52bfc243684b2f340da326aaa38e9021e4e3b2e6 (diff) | |
| parent | a61f842040eadf3e2f09eb5eeaf2955d48adaa32 (diff) | |
| download | frameworks_base-1c66faab73b2ce54bfe362f3c051ce95ed89fb22.zip frameworks_base-1c66faab73b2ce54bfe362f3c051ce95ed89fb22.tar.gz frameworks_base-1c66faab73b2ce54bfe362f3c051ce95ed89fb22.tar.bz2 | |
Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
Diffstat (limited to 'docs/html/resources')
| -rw-r--r-- | docs/html/resources/tutorials/opengl/opengl-es10.jd | 2 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/opengl/opengl-es20.jd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/resources/tutorials/opengl/opengl-es10.jd b/docs/html/resources/tutorials/opengl/opengl-es10.jd index 3570766..2b44620 100644 --- a/docs/html/resources/tutorials/opengl/opengl-es10.jd +++ b/docs/html/resources/tutorials/opengl/opengl-es10.jd @@ -58,7 +58,7 @@ carefully consider which version of the OpenGL ES API (1.0/1.1 or 2.0) is most a needs. For more information, see <a href="{@docRoot}guide/topics/graphics/opengl.html#choosing-version">Choosing an OpenGL API Version</a>. If you would prefer to use OpenGL ES 2.0, see the <a -href="{@docRoot}resources/tutorials/opengl/opengl-es20.jd">OpenGL ES 2.0 tutorial</a>.</p> +href="{@docRoot}resources/tutorials/opengl/opengl-es20.html">OpenGL ES 2.0 tutorial</a>.</p> <p>Before you start, you should understand how to create a basic Android application. If you do not know how to create an app, follow the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello diff --git a/docs/html/resources/tutorials/opengl/opengl-es20.jd b/docs/html/resources/tutorials/opengl/opengl-es20.jd index 889dd50..dd23dbf 100644 --- a/docs/html/resources/tutorials/opengl/opengl-es20.jd +++ b/docs/html/resources/tutorials/opengl/opengl-es20.jd @@ -57,7 +57,7 @@ carefully consider which version of the OpenGL ES API (1.0/1.1 or 2.0) is most a needs. For more information, see <a href="{@docRoot}guide/topics/graphics/opengl.html#choosing-version">Choosing an OpenGL API Version</a>. If you would prefer to use OpenGL ES 1.0, see the <a -href="{@docRoot}resources/tutorials/opengl/opengl-es10.jd">OpenGL ES 1.0 tutorial</a>.</p> +href="{@docRoot}resources/tutorials/opengl/opengl-es10.html">OpenGL ES 1.0 tutorial</a>.</p> <p>Before you start, you should understand how to create a basic Android application. If you do not know how to create an app, follow the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello |