Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp * commit '083310d316059c6592120c32e1c0b736e85b83c0': Update NFC settings description, and fix polarity.
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp * commit '083310d316059c6592120c32e1c0b736e85b83c0': Update NFC settings description, and fix polarity.