| commit | 2d1664875abba3670d7ca0339f260dc69cd007e4 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Aug 21 09:55:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 09:55:56 2015 +0000 |
| tree | 080dc172621a1a05f894484aaef6ed080c2b456d | |
| parent | 41d9a0040a793f1df1b0a097daf92f126003745b [diff] | |
| parent | 0c2fc4ebc4fe7454488a325d755501a7f6824596 [diff] |
am 0c2fc4eb: Merge "Adding MiFARE DESFire format support" * commit '0c2fc4ebc4fe7454488a325d755501a7f6824596': Adding MiFARE DESFire format support