summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/guide_toc.cs
diff options
context:
space:
mode:
authorFred Chung <fchung@google.com>2010-10-05 23:39:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-05 23:39:23 -0700
commitb50d5ede6f2fdd8ea7efacd96815e01e661fdcd4 (patch)
treec152127e59a383fe17b783501c93d364db5a9cdb /docs/html/guide/guide_toc.cs
parenta2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9 (diff)
parent30264c9b85109ae58c1e472a747bf47464cc1632 (diff)
downloadframeworks_base-b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4.zip
frameworks_base-b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4.tar.gz
frameworks_base-b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4.tar.bz2
am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread * commit '30264c9b85109ae58c1e472a747bf47464cc1632': Doc change: Adding new docs for Device Admin API.
Diffstat (limited to 'docs/html/guide/guide_toc.cs')
-rw-r--r--docs/html/guide/guide_toc.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 35ce17e..43a5e8d 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -257,6 +257,9 @@
<li><a href="<?cs var:toroot?>guide/topics/testing/testing_android.html">
<span class="en">Testing and Instrumentation</span></a>
<span class="new">new!</span></li>
+ <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">
+ <span class="en">Device Administration</span></a>
+ <span class="new">new!</span></li>
</ul>
</li>