Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp * commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4': Add NFC checkbox to Settings app.
Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp * commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4': Add NFC checkbox to Settings app.