Merge "Fix typo in DevicePolicyManager documentation"

author Nick Kralevich <nnk@google.com>

Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 3 Jul 2014 01:32:01 +0000 (01:32 +0000)
author Nick Kralevich <nnk@google.com>
Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 3 Jul 2014 01:32:01 +0000 (01:32 +0000)
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
author	Nick Kralevich <nnk@google.com>
	Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 3 Jul 2014 01:32:01 +0000 (01:32 +0000)