Commits
Nick Pelly authored and Android Git Automerger committed f955d057dddM
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 * commit 'c6a0277bca29359ec1aee123495065982d2eea7a': Fix NPE on devices that don't have NFC.
Showing diff to85a80ba8cd9