am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1

* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
This commit is contained in:
Joe Fernandez
2012-02-09 13:48:46 -08:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -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