summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/guide_toc.cs
diff options
context:
space:
mode:
authorFred Chung <fchung@google.com>2010-10-05 23:45:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-05 23:45:29 -0700
commit2bd6afed6c4f101932b73dcbc6ec80b61e718568 (patch)
tree50a3e052e5ed3c30d2997c0f5366620524d0912c /docs/html/guide/guide_toc.cs
parent92d29c66f5cb69627172d21057e672eaba2eb03f (diff)
parentb50d5ede6f2fdd8ea7efacd96815e01e661fdcd4 (diff)
downloadframeworks_base-2bd6afed6c4f101932b73dcbc6ec80b61e718568.zip
frameworks_base-2bd6afed6c4f101932b73dcbc6ec80b61e718568.tar.gz
frameworks_base-2bd6afed6c4f101932b73dcbc6ec80b61e718568.tar.bz2
am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4' into gingerbread-plus-aosp * commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4': 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>