tree c7c8719658c302297337f8c3c855fe866cdb41f3
parent 9d5e2307bdde4c90b588b7ae89c718f5fea668ee
parent 9ef5740e60154a558cd466ea27f344e0b033cd4e
author Jean-Baptiste Queru <jbq@google.com> 1339177872 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339177872 -0700

am 9ef5740e: Merge "Skip MIFARE Ultralight test for an unsupported device"

* commit '9ef5740e60154a558cd466ea27f344e0b033cd4e':
  Skip MIFARE Ultralight test for an unsupported device