am e095ece7: Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into...
authorNick Pelly <npelly@google.com>
Mon, 13 Dec 2010 20:30:45 +0000 (12:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Dec 2010 20:30:45 +0000 (12:30 -0800)
commita30644fa14c7d43a93e9bd3a0d5867c88c6f84ae
tree85b6a8ca269735cba074b72ac33737edc2b47ef1
parent1f0316d8a2831df743fbfc1b1f5e1d547f12451c
parente095ece7b6c691b1c49d23cb42dc87f9957e665d
am e095ece7: Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

* commit 'e095ece7b6c691b1c49d23cb42dc87f9957e665d':
  Update Tag for new NfcAdapter.getDefaultAdapter(Context)