Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp * commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed': Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp * commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed': Make summary appear for both checked and unchecked NFC checkbox in Settings.