tree 9972bb5d1a99298e37e30186bdb6ba15dd799bc5
parent a13efe26f7dda40b7f5ece84adf9482b285e01a3
parent a8158e16d05b154c2f9afe9e54ffaa67d3209833
author Martijn Coenen <maco@google.com> 1440074560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440074560 +0000

am a8158e16: Merge "Fix ISO15693 tag crash issue"

* commit 'a8158e16d05b154c2f9afe9e54ffaa67d3209833':
  Fix ISO15693 tag crash issue