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

* commit '7cd122a549831611ce79389e481484ade16744f1':
  Add device admin to wearables for API8 Compat
This commit is contained in:
Adam Lesinski 2014-03-17 19:52:35 +00:00 committed by Android Git Automerger
commit 80acb20ca9

View File

@ -36,6 +36,9 @@
<feature name="android.software.home_screen" /> <feature name="android.software.home_screen" />
<feature name="android.software.input_methods" /> <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 GPS must include android.hardware.location.gps.xml -->
<!-- devices with an autofocus camera and/or flash must include either <!-- devices with an autofocus camera and/or flash must include either
android.hardware.camera.autofocus.xml or android.hardware.camera.autofocus.xml or