tree 080dc172621a1a05f894484aaef6ed080c2b456d
parent 41d9a0040a793f1df1b0a097daf92f126003745b
parent 0c2fc4ebc4fe7454488a325d755501a7f6824596
author Martijn Coenen <maco@google.com> 1440150956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440150956 +0000

am 0c2fc4eb: Merge "Adding MiFARE DESFire format support"

* commit '0c2fc4ebc4fe7454488a325d755501a7f6824596':
  Adding MiFARE DESFire format support