Merge "Fix NPE on devices that don't have NFC." into ics-mr1

This commit is contained in:
Nick Pelly 2011-11-17 12:48:48 -08:00 committed by Android (Google) Code Review
commit 3d1e8f0610

Diff Content Not Available