tree 55849bb7eec65929d4fd56ff2c0f9731a8cca0f5
parent 31268de080326682c57c7b6d658a0ceeeca4ddc7
parent d2402959c8c921d906764f02898a2db4c0835940
author Martijn Coenen <maco@google.com> 1441125375 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441125375 +0000

am d2402959: Merge "Add Mifare Classic support"

* commit 'd2402959c8c921d906764f02898a2db4c0835940':
  Add Mifare Classic support