Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a300ea98 authored by Joe Fernandez's avatar Joe Fernandez Committed by Android Git Automerger
Browse files

am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue... 

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

* commit '1c66faab':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
parents cf18f420 1c66faab

docs/html/resources/tutorials/opengl/opengl-es10.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

needs. For more information, see

<a href="{@docRoot}guide/topics/graphics/opengl.html#choosing-version">Choosing an OpenGL API

<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

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

<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

know how to create an app, follow the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello

docs/html/resources/tutorials/opengl/opengl-es20.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

needs. For more information, see

<a href="{@docRoot}guide/topics/graphics/opengl.html#choosing-version">Choosing an OpenGL API

<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

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

<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

know how to create an app, follow the <a href="{@docRoot}resources/tutorials/hello-world.html">Hello