| commit | 407c94a147ac52dbd3747160748a219553bcbf2b | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Jul 11 11:07:22 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 11 11:07:22 2011 -0700 |
| tree | 405af4697e1039904aa5431bde4cf5b22820379b | |
| parent | c6818784e75173c7edde2fe0af7a50bd8bd86b20 [diff] | |
| parent | 340f5a765bf7fba7f8fc363323e64fdef885ad7d [diff] |
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread