| commit | be0ed98e3ac2e2503294e12a5bac588c595b647c | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Sun Dec 05 18:13:10 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Dec 05 18:13:10 2010 -0800 |
| tree | 1828739c054617c3bfa5cb08c15e109c60faa99b | |
| parent | 3d3f99de9463a25b9053bc99378df194557a4fdf [diff] | |
| parent | 4995b0cd7e18382da1dfdb0d5dc8f3a1bdc31ec7 [diff] |
am 3d524e56: Merge gingerbread-nfc into gingerbread * commit '3d524e562606e7994ede3429b37937f40f94cd41': First implementation of MifareUltralight