| commit | 5b9b4ebf78ae62142c2955104fec21d831916c65 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Jul 15 10:47:10 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 15 10:47:10 2011 -0700 |
| tree | 62a3555429c3caf6d6220df764adf91a9ee9b991 | |
| parent | 5812538e90096b00d4b9c10a866920b78080879f [diff] | |
| parent | 4fa5dc52c04680db3b15b8fe741a2ee699ad933f [diff] |
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)