| commit | 68edd6222e661e5e57142e8faeba31369b3251b0 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Dec 06 11:55:08 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 06 11:55:08 2010 -0800 |
| tree | 0b58f551214399aeabda9e029818d4c4e9d1049d | |
| parent | 5f87205146dec7443c2a97c5776b904f76d93733 [diff] | |
| parent | be0ed98e3ac2e2503294e12a5bac588c595b647c [diff] |
am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread * commit 'cbf4e3525be80607c4d68630faf927ce6a717f72': First implementation of MifareUltralight