commit 77d1f1a41208406bf7a3f4950ebfd647902ea295
author Fabrice Di Meglio <fdimeglio@google.com> Thu Jun 05 09:47:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 05 09:47:53 2014 +0000
tree 57a9a748af37e77be6a35b14bdf2492805351aaa
parent 2d444968a56191e17403563c54274521cba6424f
parent 5b01c0b3ebf18a22b8ecbe0e09ff39807e574040

am 5b01c0b3: Merge "Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker" into lmp-preview-dev

* commit '5b01c0b3ebf18a22b8ecbe0e09ff39807e574040':
  Fix bug #15433763 "Sounds & Notifications" appears twice in the shortcut icon picker

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fe55a71..cda4f1a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1697,7 +1697,6 @@
                 <action android:name="android.settings.SOUND_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.NotificationSettings" />