am 85c0a093: am 2ab32d69: Rename managed_profiles feature to managed_users

* commit '85c0a0938ca60acb071d016e76014f869478f2cc':
  Rename managed_profiles feature to managed_users
This commit is contained in:
Amith Yamasani 2014-09-13 03:07:24 +00:00 committed by Android Git Automerger
commit e19112134b
3 changed files with 6 additions and 6 deletions

View File

@ -14,7 +14,7 @@
limitations under the License.
-->
<!-- This is the standard feature indicating that the device supports managed profiles. -->
<!-- This is the standard feature indicating that the device supports managed users. -->
<permissions>
<feature name="android.software.managed_profiles" />
<feature name="android.software.managed_users" />
</permissions>

View File

@ -46,8 +46,8 @@
<!-- Feature to specify if the device supports adding device admins. -->
<feature name="android.software.device_admin" />
<!-- Feature to specify if the device support managed profiles. -->
<feature name="android.software.managed_profiles" />
<!-- Feature to specify if the device support managed users. -->
<feature name="android.software.managed_users" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with an autofocus camera and/or flash must include either

View File

@ -47,8 +47,8 @@
<!-- Feature to specify if the device supports adding device admins. -->
<feature name="android.software.device_admin" />
<!-- Feature to specify if the device support managed profiles. -->
<feature name="android.software.managed_profiles" />
<!-- Feature to specify if the device support managed users. -->
<feature name="android.software.managed_users" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with a rear-facing camera must include one of these as appropriate: