OSDN Git Service

Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
authorNick Pelly <npelly@google.com>
Sat, 11 Dec 2010 01:18:54 +0000 (17:18 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 11 Dec 2010 01:18:54 +0000 (17:18 -0800)

Trivial merge