resolved conflicts for merge of 7044ee16 to mnc-preview-docs

Change-Id: Ia0d831660d7744f34c68dba62e19a11c83ec2ee7

diff --cc docs/html-ndk/ndk/guides/guides_toc.cs
index bfb4ea9,3763c53..90eaea4
--- 1/docs/html-ndk/ndk/guides/guides_toc.cs
--- 2/docs/html-ndk/ndk/guides/guides_toc.cs
+++ b/docs/html-ndk/ndk/guides/guides_toc.cs
@@@ -6,25 -6,67 +6,67 @@@
         localized titles are added in the language order specified below.
  ?>
  
 -
  <ul id="nav">
-   <li class="nav-section">
-     <div class="nav-section-header"><a href="/ndk/guides/index.html">
-             <span class="en">Getting Started</span></a>
-     </div>
-     <ul>
-       <li><a href="/ndk/guides/md_1__concepts__concepts.html">
-             <span class="en">Concepts</span>
-           </a></li>
-       <li><a href="<?cs var:toroot ?>ndk/index.html">
-             <span class="en">Device Compatibility</span>
-           </a></li>
-       <li><a href="<?cs var:toroot ?>ndk/index.html">
-           <span class="en">System Permissions</span>
-         </a>
-       </li>
-     </ul>
-   </li>
+ <li><strong>NDK</strong>
+    <ul>
+    <li><a href="/ndk/guides/index.html"><span class="en">Getting Started</span></a>
+       <ul>
+       <li><a href="setup.html">Setup</a></li>
+       <li><a href="concepts.html">Concepts</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/build.html"><span class="en">Building</span></a>
+       <ul>
+       <li><a href="">ndk-build</a></li>
+       <li><a href="">Android.mk</a></li>
+       <li><a href="">Application.mk</a></li>
+       <li><a href="">Standalone Toolchain</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/debug.html"><span class="en">Debugging</span></a>
+       <ul>
+       <li><a href="">ndk-gdb</a></li>
+       <li><a href="">ndk-stack</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/arch.html"><span class="en">Architectures and CPUs</span></a>
+       <ul>
+       <li><a href="">ABI Management</a></li>
+       <li><a href="">Neon</a></li>
+       <li><a href="">Mips</a></li>
+       <li><a href="">x86</a></li>
+       <li><a href="">x86-64</a></li>
+       <li><a href="">CPU Features</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/libs.html"><span class="en">Libraries</span></a>
+       <ul>
+       <li><a href="">Stable APIs</a></li>
+       <li><a href="">C++ Support</a></li>
+       <li><a href="">Prebuilt Libraries</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/sample.html"><span class="en">Sample Walkthrough</span></a>
+       <ul>
+       <li><a href="">hello-jni</a></li>
+       <li><a href="">native-activity</a></li>
+       <li><a href="">Teapot</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/atomics.html"><span class="en">Atomics</span></a></li>
+    <li><a href="/ndk/guides/importing.html"><span class="en">Importing Modules</span></a></li>
+    <li><a href="/ndk/guides/depends.html"><span class="en">ndk-depends</span></a></li>
+    <li><a href="/ndk/guides/system.html"><span class="en">System Image Issues</span></a></li>
+    <li><a href="/ndk/guides/licenses.html"><span class="en">Licenses</span></a></li>
+    </ul></li>
+ <li><strong>Radiance</strong>
+    <ul>
+    <li><a href="/ndk/guides/null.html"><span class="en">Stub 1</span></a>
+       <ul>
+       <li><a href="">Stublet</a></li>
+       <li><a href="">Stublet</a></li>
+       </ul></li>
+    <li><a href="/ndk/guides/null.html"><span class="en">Stub 2, etc.</span></a>
+       <ul>
+       <li><a href="">Another Stublet</a></li>
+       <li><a href="">Another Stublet</a></li>
+       </ul></li>
+    </ul></li>
 +
  </ul>