Merge "Fix two bug in the TTS settings." into ics-mr1

diff --combined AndroidManifest.xml
index 6a17bb9,3326b5d..cf87d35
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -94,7 -94,6 +94,7 @@@
                  <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>
@@@ -717,7 -716,7 +717,7 @@@
                  <category android:name="android.intent.category.DEFAULT" />
              </intent-filter>
              <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                 android:value="com.android.settings.TextToSpeechSettings" />
+                 android:value="com.android.settings.tts.TextToSpeechSettings" />
              <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                  android:resource="@id/language_settings" />
          </activity>
@@@ -980,11 -979,11 +980,11 @@@
                  android:clearTaskOnLaunch="true">
              <intent-filter>
                  <action android:name="android.intent.action.MAIN" />
 -                <action android:name="android.settings.ANDROID_BEAM_SETTINGS" />
 +                <action android:name="android.settings.NFCSHARING_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.NdefPush" />
 +                android:value="com.android.settings.nfc.AndroidBeam" />
          </activity>
  
          <!-- Accessibility tutorial -->