am 01588aca: Merge "Preserve invariant that sService is not null (although...
am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit '01588aca':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)