commit 509f454ce55a1234167a523ac12a095ef66e2495
author Takayuki Hoshi <hoshi@google.com> Thu Apr 16 04:09:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 04:09:38 2015 +0000
tree 11b0a776853bb3819ffb0f8793a073ab0e54c98b
parent 9bba28622a807edd266dbbee5807f88443bf910e
parent adce27115057fb4d200924d00689a713030864dd

am adce2711: am 305d9eea: am 22131d27: am b40bc889: Merge "Disable Notification Package Prior item for the watch feature" into lmp-sprout-dev

* commit 'adce27115057fb4d200924d00689a713030864dd':
  Disable Notification Package Prior item for the watch feature

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 895ee6e..149831e 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1026,11 +1026,7 @@
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_notifications" />
             <meta-data android:name="test_excluded_features"
-                    android:value="android.hardware.type.watch" />
-            <meta-data android:name="test_excluded_features"
-                    android:value="android.hardware.type.television" />
-            <meta-data android:name="test_excluded_features"
-                    android:value="android.software.leanback" />
+                       android:value="android.hardware.type.watch:android.software.leanback" />
         </activity>
 
         <service android:name=".notifications.MockListener"