am e095ece7: Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into...
Nick Pelly [Mon, 13 Dec 2010 20:30:45 +0000 (12:30 -0800)]
* commit 'e095ece7b6c691b1c49d23cb42dc87f9957e665d':
  Update Tag for new NfcAdapter.getDefaultAdapter(Context)


Trivial merge