| commit | c1286804cc839ec7006d6e9651c73ec7b3180157 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Fri Dec 10 17:18:54 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 10 17:18:54 2010 -0800 |
| tree | 474341216ad85447e23972c87411ef9f6c1f736f | |
| parent | 99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8 [diff] | |
| parent | 267419ff8b6a0458c098a1787e11df2bc9ddb38a [diff] |
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread