| commit | 1bce9e25b6979780d849096059ef73507bdda250 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Wed Jul 13 22:38:44 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 13 22:38:44 2011 -0700 |
| tree | f8c7848d12dac6e23fb714b8b7f3e0aee8a802f1 | |
| parent | ab3ec17608fd17b48ae3a4b7359f5a150da3cf7e [diff] | |
| parent | 01588acaf87cfe9916239b7b26cc6810e0097138 [diff] |
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)