am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread

Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'

* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
  Prevent use of NFC api if device is not featurized for NFC.
This commit is contained in:
Nick Pelly 2010-10-19 09:53:03 -07:00 committed by Android Git Automerger
commit 863ab505f7

Diff Content Not Available