| commit | 4fa5dc52c04680db3b15b8fe741a2ee699ad933f | [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 | d3ab7b42eae95f1b0ea7b186adf4a1def484babf | |
| parent | 99a444e7312aa099adcd819fb6a269b9aa925d2f [diff] | |
| parent | 407c94a147ac52dbd3747160748a219553bcbf2b [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)