commit 12790a38a6c0e36a2cdc4155e457f294f93aa528
author The Android Automerger <android-build@android.com> Wed Nov 02 10:07:45 2011 -0700
committer The Android Automerger <android-build@android.com> Wed Nov 02 10:07:45 2011 -0700
tree 48f46e84b67d3ea2bc993d89157ba4455e01cb7a
parent 90e6d7933311752deb608d9f1cb9ad5a63730688

Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"

This reverts commit 1b4f5d743594971eab9747a84ee21420a8602bbe, reversing
changes made to 19d9a3d2846c538502003a81522f6d285b9ff24b.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6a17bb9..1da79f8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -94,7 +94,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
                 <action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />
-                <action android:name="android.settings.NFC_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
@@ -980,11 +979,11 @@
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.NFCSHARING_SETTINGS" />
+                <action android:name="android.settings.ANDROID_BEAM_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.nfc.AndroidBeam" />
+                android:value="com.android.settings.nfc.NdefPush" />
         </activity>
 
         <!-- Accessibility tutorial -->