am da08f31f: am 792d4356: Merge "Move NFC setting lower down the Setting\'s list...

Merge commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c'

* commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c':
  Move NFC setting lower down the Setting's list.

diff --cc res/xml/wireless_settings.xml
index 27d00c0,620472d..ffbaef2
--- 1/res/xml/wireless_settings.xml
--- 2/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@@ -69,8 -70,18 +63,14 @@@
          android:key="vpn_settings"
          android:title="@string/vpn_settings_title"
          android:summary="@string/vpn_settings_summary" >
 -        <intent
 -            android:action="android.intent.action.MAIN"
 -            android:targetPackage="com.android.settings"
 -            android:targetClass="com.android.settings.vpn.VpnSettings" />
      </PreferenceScreen>
  
+     <CheckBoxPreference
+         android:key="toggle_nfc"
+         android:title="@string/nfc_quick_toggle_title"
+         android:summary="@string/nfc_quick_toggle_summary"
+         android:persistent="false" />
+ 
      <PreferenceScreen
          android:title="@string/network_settings_title"
          android:summary="@string/network_settings_summary"