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

* commit '01588acaf87cfe9916239b7b26cc6810e0097138':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
This commit is contained in:
Nick Pelly 2011-07-13 22:38:44 -07:00 committed by Android Git Automerger
commit 4fa5dc52c0

Diff Content Not Available