tree 3d643d9391e2907d31e0d67b538eeb522d9070a4
parent bd53a1c0372cdf7deeb07e5146492f1cf4919e19
parent a407eaaefd53f13bf9fbeaf43ef8de00604e8183
author Martijn Coenen <maco@google.com> 1439985108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439985108 +0000

am a407eaae: Merge "Fix Mifare Classic presence check."

* commit 'a407eaaefd53f13bf9fbeaf43ef8de00604e8183':
  Fix Mifare Classic presence check.