Commits
Nick Pelly authored and Android Git Automerger committed c0e93a849f8M
am 7ea5c45e: NFC settings cleanup. Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp * commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1': NFC settings cleanup.
Showing diff to0c551368938