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

Browse Source

* commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)

...

This commit is contained in:

Nick Pelly 2011-07-15 11:20:44 -07:00 committed by Android Git Automerger

parent bbc21229d7 5b9b4ebf78

commit 96f1959dfe

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available