tree 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13
parent 06c967948be85ef93bd1df6bdbf55b4e9c895b26
parent d4a9d3c4d949f7383ad3540ba82f99796b8b407e
author Martijn Coenen <maco@google.com> 1438627302 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438627302 +0000

am d4a9d3c4: Merge "ISO-DEP presence check workaround"

* commit 'd4a9d3c4d949f7383ad3540ba82f99796b8b407e':
  ISO-DEP presence check workaround