am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

Browse Source

* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
  Fix NPE on devices that don't have NFC.

...

This commit is contained in:

Nick Pelly 2011-11-17 15:12:56 -08:00 committed by Android Git Automerger

parent 98019c135c 637742c34e

commit 1fa578c5df

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available