OSDN Git Service

am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context...
authorNick Pelly <npelly@google.com>
Sat, 11 Dec 2010 01:22:30 +0000 (17:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Dec 2010 01:22:30 +0000 (17:22 -0800)
commit934c1b9f4b475112e635989fb3d1a9d191a9c9e7
tree1d243967ba981f3e6ee4dd753356fed5bb7b856f
parent5721cb1d528b097bd2f95dc3cf5cdcb6fec00a8e
parentc1286804cc839ec7006d6e9651c73ec7b3180157
am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

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