commit | 01588acaf87cfe9916239b7b26cc6810e0097138 | [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 | 384090704e64d015770a77b5b6825c2c8dcd1547 | |
parent | 7816eded417357561496df19dfa711be5586f3b0 [diff] | |
parent | 15bc894aae9192e26c35e0af22b5dbd2a5c30028 [diff] |
Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread