commit 9d22264a36c598b87836a4a22973fefed14a6e61
author Marc Hittinger <trojal@google.com> Wed Mar 07 17:39:01 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 07 17:39:01 2018 +0000
tree 44719891965402f859f2a53a8ea3fa2eeb883dcd
parent db1422bbcb60bd15e9b445f1f6f8614bd3cc8716
parent c3237f760d296c9bc56e5163f6912994078bfa05

Merge "Remove device_admin feature from wearables." into pi-dev am: ac8342d48f
am: c3237f760d

Change-Id: I9cdef5b6589ee277016d6d184ffa043ed2cc41e1

data/etc/wearable_core_hardware.xml

diff --git a/data/etc/wearable_core_hardware.xml b/data/etc/wearable_core_hardware.xml
index d7c3730..e2ab71a 100644
--- a/data/etc/wearable_core_hardware.xml
+++ b/data/etc/wearable_core_hardware.xml
@@ -36,9 +36,6 @@
     <!-- basic system services -->
     <feature name="android.software.home_screen" />
 
-    <!-- device administration -->
-    <feature name="android.software.device_admin" />
-
     <!-- input management and third-party input method editors -->
     <feature name="android.software.input_methods" />