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