| commit | e537b0eb999e32741bb4a9283eb0d6842cc64b99 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Dec 13 12:30:40 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 13 12:30:40 2010 -0800 |
| tree | a02b2d4bfddf0cc338809e2ac3ad06ae5d8fa072 | |
| parent | 844c54d11e67963f6db0a2c0b633df30d5086083 [diff] | |
| parent | 934c1b9f4b475112e635989fb3d1a9d191a9c9e7 [diff] |
am 934c1b9f: am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread * commit '934c1b9f4b475112e635989fb3d1a9d191a9c9e7': Update Settings for new NfcAdapter.getDefaultAdapter(Context)