am 80acb20c: am 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev

* commit '80acb20ca95da161fc739abac0fb9084a76e2ced':
  Add device admin to wearables for API8 Compat
This commit is contained in:
Adam Lesinski 2014-03-17 23:32:28 +00:00 committed by Android Git Automerger
commit 20dba7e3ab

View File

@ -36,6 +36,9 @@
<feature name="android.software.home_screen" />
<feature name="android.software.input_methods" />
<!-- Feature to specify if the device supports adding device admins. -->
<feature name="android.software.device_admin" />
<!-- devices with GPS must include android.hardware.location.gps.xml -->
<!-- devices with an autofocus camera and/or flash must include either
android.hardware.camera.autofocus.xml or