summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorFred Chung <fchung@google.com>2011-12-15 22:33:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-15 22:33:31 -0800
commit14633f1b1eea585cdc094ebae75708db2293fe56 (patch)
tree2eaf15c460a57aadffc0c9f3eb38efc17ee12a13 /docs
parent8e980c1e4e86cb4c7ea679eba3cc01d64e323b26 (diff)
parent48e0617b9e7d06da803c572d6584d68898733d37 (diff)
downloadframeworks_base-14633f1b1eea585cdc094ebae75708db2293fe56.zip
frameworks_base-14633f1b1eea585cdc094ebae75708db2293fe56.tar.gz
frameworks_base-14633f1b1eea585cdc094ebae75708db2293fe56.tar.bz2
am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '48e0617b9e7d06da803c572d6584d68898733d37': Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/enterprise/device-management-policy.jd2
-rw-r--r--docs/html/training/enterprise/index.jd4
2 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/training/enterprise/device-management-policy.jd b/docs/html/training/enterprise/device-management-policy.jd
index 7b7e0d8..5190a22 100644
--- a/docs/html/training/enterprise/device-management-policy.jd
+++ b/docs/html/training/enterprise/device-management-policy.jd
@@ -33,7 +33,7 @@ class="button">Download the sample</a>
</div>
-<p>Since Android 2.2 (API level 8), the Android platform offes system-level device management
+<p>Since Android 2.2 (API level 8), the Android platform offers system-level device management
capabilities through the Device Administration APIs.</p>
<p>In this lesson, you will learn how to create a security-aware application that manages access to
diff --git a/docs/html/training/enterprise/index.jd b/docs/html/training/enterprise/index.jd
index 0145909..0db9009 100644
--- a/docs/html/training/enterprise/index.jd
+++ b/docs/html/training/enterprise/index.jd
@@ -13,9 +13,7 @@ next.link=device-management-policy.html
<!-- Required platform, tools, add-ons, devices, knowledge, etc. -->
<h2>Dependencies and prerequisites</h2>
<ul>
- <li>Android 2.0 (API Level 5) or higher</li>
- <li>Experience with <a href="{@docRoot}guide/topics/media/mediaplayer.html">Media
-Playback</a></li>
+ <li>Android 2.2 (API Level 8) or higher</li>
</ul>
<!-- related docs (NOT javadocs) -->