| commit | fed878d98bc42db61cf04d759235b8406a7d14fd | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Jul 15 11:20:44 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 15 11:20:44 2011 -0700 |
| tree | 55dd2a5d484d85fc8045547c362370c56a5bd319 | |
| parent | cbbd798066ad07bb8fbf2fbd58fc6adfa6b1c524 [diff] | |
| parent | fc00b2ed4fa64621015b47310b91e937581bd3a3 [diff] |
am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread * commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3': Preserve invariant that sService is not null (although NfcAdapter.get() can return null)