From: Nick Pelly Date: Sat, 11 Dec 2010 01:18:54 +0000 (-0800) Subject: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread X-Git-Tag: android-x86-4.4-r1~2043^2~32 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1286804cc839ec7006d6e9651c73ec7b3180157;p=android-x86%2Fpackages-apps-Settings.git Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread --- c1286804cc839ec7006d6e9651c73ec7b3180157