summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fred Chung <fchung@google.com> 2011-12-15 22:37:40 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-15 22:37:40 -0800
commit26c4a3e9792755e2ab66331822d6faabc824782e (patch)
tree548964c12285536798796ae02bbf17c7f6253211
parent734a9954eca793d480e05fd012f82111ed54d2f1 (diff)
parentd30167f0cda249c9a0d1d118d837d58f3c2b2c89 (diff)
am d30167f0: am 14633f1b: am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit 'd30167f0cda249c9a0d1d118d837d58f3c2b2c89': Fixed Android U Enterprise lesson pre-requisites and a minor typo.
-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 7b7e0d89ff38..5190a22651d0 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 01459090ed1b..0db9009cfaf1 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) -->