summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Kilbourn <tkilbourn@google.com>2014-08-28 16:24:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-28 16:24:50 +0000
commit6ea1ea4952d18f9e2fd96626ce4c6cfa092c3d7a (patch)
tree263687f1d44524ab6d57287e7431691bedae743c
parentdf7f5dec56451f7b5b375c68239abb80ba2758d7 (diff)
parent1ed3bea40636b4740ab206e86c0f084341658eb4 (diff)
downloadandroid_device_google_atv-6ea1ea4952d18f9e2fd96626ce4c6cfa092c3d7a.tar.gz
android_device_google_atv-6ea1ea4952d18f9e2fd96626ce4c6cfa092c3d7a.tar.bz2
android_device_google_atv-6ea1ea4952d18f9e2fd96626ce4c6cfa092c3d7a.zip
Merge "Remove device admin from tv features." into lmp-dev
-rw-r--r--tv_core_hardware.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/tv_core_hardware.xml b/tv_core_hardware.xml
index ecdbfe7..50d3f4b 100644
--- a/tv_core_hardware.xml
+++ b/tv_core_hardware.xml
@@ -27,7 +27,6 @@
<feature name="android.software.app_widgets" />
<feature name="android.software.backup" />
- <feature name="android.software.device_admin" />
<feature name="android.software.leanback" />
<feature name="android.software.leanback_only" />
<feature name="android.software.live_tv" />