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

Commit 051d16eb authored by Robert Ly's avatar Robert Ly
Browse files

resolved conflicts for merge of 398d021b to master 

Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
parents 2fd17c45 398d021b

docs/html/guide/guide_toc.cs

+17 −3
Original line number Diff line number Diff line
@@ -244,9 +244,6 @@ 
          <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html">

                <span class="en">3D with OpenGL</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/graphics/renderscript.html">

                <span class="en">3D with Renderscript</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/graphics/animation.html">

                <span class="en">Property Animation</span>

              </a></li>
@@ -255,6 +252,23 @@ 
              </a></li>

        </ul>

      </li>

      <li class="toggle-list">

	        <div><a href="<?cs var:toroot ?>guide/topics/renderscript/index.html">

	            <span class="en">RenderScript</span>

	          </a>

	          <span class="new-child">new!</span></div>

	        <ul>

	          <li><a href="<?cs var:toroot ?>guide/topics/renderscript/graphics.html">

	                <span class="en">3D Graphics</span>

	              </a>

	          </li>

	          <li><a href="<?cs var:toroot ?>guide/topics/renderscript/compute.html">

	                <span class="en">Compute</span>

	              </a>

	          </li>         

	        </ul>

  	  </li>



      <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">

            <span class="en">Audio and Video</span>

          </a></li>

docs/html/guide/topics/graphics/renderscript.html

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<html>

<head>

<meta http-equiv="refresh" content="0;url=http://developer.android.com/guide/topics/renderscript/index.html">

<title>Redirecting...</title>

</head>

<body>

<p>You should be redirected. Please <a

href="http://developer.android.com/guide/topics/renderscript/index.html">click here</a>.</p>

</body>

</html>
 
 No newline at end of file