Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b50d5ede authored by Fred Chung's avatar Fred Chung Committed by Android Git Automerger
Browse files

am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo 

Merge commit '30264c9b' into gingerbread

* commit '30264c9b':
  Doc change: Adding new docs for Device Admin API.
parents a2a0a98a 30264c9b

docs/html/guide/guide_toc.cs

+3 −0
Original line number Diff line number Diff line
@@ -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>

docs/html/guide/topics/admin/device-admin.jd

0 → 100644
+494 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/images/admin/device-admin-activate-prompt.png

0 → 100755
+37.7 KiB

File added.

Preview size limit exceeded, changes collapsed.

View file

docs/html/images/admin/device-admin-app.png

0 → 100755
+30.6 KiB
Loading image diff...