am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

* commit 'c1286804cc839ec7006d6e9651c73ec7b3180157':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)