commit 89e17bf81e2c16bc31e8f66b23dc0091a1d334cc
author Glenn Kasten <gkasten@google.com> Wed May 01 21:10:28 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 01 21:10:28 2013 +0000
tree 7c4af4e6488e2d9ffdaa9e42ace199fc4c08517d
parent ab29c8e67e1a056d3e769b58732bed708a1dcf78
parent 963fd95dbd338dc6676532ac15ec376c097c0ffc

Merge "Add audio terminology" into jb-mr2-dev

src/devices/devices_toc.cs

diff --git a/src/devices/devices_toc.cs b/src/devices/devices_toc.cs
index 6e31072..a1a37c6 100644
--- a/src/devices/devices_toc.cs
+++ b/src/devices/devices_toc.cs
@@ -149,12 +149,12 @@
      <li class="nav-section">
           <div class="nav-section-header">
             <a href="<?cs var:toroot ?>devices/tech/security/index.html">
-              <span class="en">Input</span>
+              <span class="en">Security</span>
             </a>
           </div>
           <ul>
             <li>      
-              <a href="<?cs var:toroot ?>devices/tech/security/enhancements.html">
+              <a href="<?cs var:toroot ?>devices/tech/security/enhancements42.html">
                 <span class="en">Security Enhancements in Android 4.2</span>
               </a>
             </li>

src/devices/tech/security/enhancements42.jd

diff --git a/src/devices/tech/security/enhancements.jd b/src/devices/tech/security/enhancements42.jd
similarity index 100%
rename from src/devices/tech/security/enhancements.jd
rename to src/devices/tech/security/enhancements42.jd