| commit | 934c1b9f4b475112e635989fb3d1a9d191a9c9e7 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Dec 10 17:22:30 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 10 17:22:30 2010 -0800 |
| tree | 1d243967ba981f3e6ee4dd753356fed5bb7b856f | |
| parent | 5721cb1d528b097bd2f95dc3cf5cdcb6fec00a8e [diff] | |
| parent | c1286804cc839ec7006d6e9651c73ec7b3180157 [diff] |
am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread * commit 'c1286804cc839ec7006d6e9651c73ec7b3180157': Update Settings for new NfcAdapter.getDefaultAdapter(Context)