Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp * commit 'cd99332fee649afd85798499cea5c45a098b8a20': Update settings app for new NFC API.
Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp * commit 'cd99332fee649afd85798499cea5c45a098b8a20': Update settings app for new NFC API.