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

* commit '1bce9e25b6979780d849096059ef73507bdda250':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
This commit is contained in:
Nick Pelly 2011-07-15 10:47:10 -07:00 committed by Android Git Automerger
commit 5b9b4ebf78

Diff Content Not Available