From ca4cc3cf6515d1b259a55cec41a866a64772fef2 Mon Sep 17 00:00:00 2001
From: Scott Main <smain@google.com>
Date: Thu, 21 Jul 2011 11:16:40 -0700
Subject: [PATCH] cherrypick Change-Id:
 I9f4688a7eb3dfc22f423c114befc665f7f83f168 docs: add JNI Tips doc to the dev
 guide sidenav

Change-Id: I7522ba8bcad96d5c424f7e894e62ceb700df3027
---
 docs/html/guide/guide_toc.cs            | 11 +++++++++--
 docs/html/guide/practices/design/jni.jd |  4 ----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index fabd43e849e24..a647cd39fd770 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -733,9 +733,16 @@
       <li><a href="<?cs var:toroot ?>guide/practices/design/accessibility.html">
             <span class="en">Designing for Accessibility</span>
           </a></li>
-      <li><a href="<?cs var:toroot ?>guide/practices/design/performance.html">
+      <li class="toggle-list">
+        <div><a href="<?cs var:toroot ?>guide/practices/design/performance.html">
             <span class="en">Designing for Performance</span>
-          </a></li>
+          </a> <span class="new-child">new!</span></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/practices/design/jni.html">
+                <span class="en">JNI Tips</span>
+              </a> <span class="new">new!</span></li>
+        </ul>
+      </li>
       <li><a href="<?cs var:toroot ?>guide/practices/design/responsiveness.html">
             <span class="en">Designing for Responsiveness</span>
           </a></li>
diff --git a/docs/html/guide/practices/design/jni.jd b/docs/html/guide/practices/design/jni.jd
index 39624f51386d0..1d0e26e0a0828 100644
--- a/docs/html/guide/practices/design/jni.jd
+++ b/docs/html/guide/practices/design/jni.jd
@@ -6,7 +6,6 @@ page.title=JNI Tips
 
 <h2>In this document</h2>
 <ol>
-  <li><a href="#what">What is JNI?</a></li>
   <li><a href="#JavaVM_and_JNIEnv">JavaVM and JNIEnv</a></li>
   <li><a href="#threads">Threads</a></li>
   <li><a href="#jclass_jmethodID_and_jfieldID">jclass, jmethodID, and jfieldID</a></li>
@@ -27,9 +26,6 @@ page.title=JNI Tips
 </div>
 </div>
 
-<a name="what_is_jni" id="what_is_jni"></a>
-<h2>What is JNI?</h2>
-
 <p>JNI is the Java Native Interface.  It defines a way for code written in the
 Java programming language to interact with native
 code, e.g. functions written in C/C++.  It's VM-neutral, has support for loading code from