| commit | fc00b2ed4fa64621015b47310b91e937581bd3a3 | [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 | e2b2f732df725c38ae33a5137c58a8c4824fbd37 | |
| parent | e1635197bb6e6471b333d194855bb399da419957 [diff] | |
| parent | 1bce9e25b6979780d849096059ef73507bdda250 [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)