| commit | fb515337c2c8ceefe47b7387ebffa2b3185ef2ba | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Oct 15 18:21:06 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 15 18:21:06 2010 -0700 |
| tree | 7b7c5c4220d0071cf7f3050ec9378dccffe31d59 | |
| parent | 8de45a6686b298d09c5195e332f202223a555b91 [diff] | |
| parent | e1a9ca686249ebe7c85a98d467bb705e4c3eed2f [diff] |
am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp * commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f': Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.