OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8de45a6 e1a9ca6)
am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence...
authorNick Pelly <npelly@google.com>
Sat, 16 Oct 2010 01:21:06 +0000 (18:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 16 Oct 2010 01:21:06 +0000 (18:21 -0700)
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp

* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help