tree 88ffe301be8059a0a55fffdc795108e6a1624c97
parent 9253ed14922b27df55bddc3bc4d9c2379bcaa42e
parent a407eaaefd53f13bf9fbeaf43ef8de00604e8183
author Martijn Coenen <maco@google.com> 1439985190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439985190 +0000

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

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