Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

author Benjamin Franz <bfranz@google.com>

Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 8 Jul 2015 13:59:34 +0000 (13:59 +0000)
author Benjamin Franz <bfranz@google.com>
Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 8 Jul 2015 13:59:34 +0000 (13:59 +0000)
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
author	Benjamin Franz <bfranz@google.com>
	Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 8 Jul 2015 13:59:34 +0000 (13:59 +0000)