tree b5ba277292b3c65679b7e416ba7284f2568a28ce
parent acb10eca6be7ebf130e58bcb704ffab936d36658
parent 687512f08bd0779607e5d130181fab58cfc4c66b
author Martijn Coenen <maco@google.com> 1438941716 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438941716 +0000

am 687512f0: Merge "Bump libnfc-nci version for M." into mnc-dr-dev

* commit '687512f08bd0779607e5d130181fab58cfc4c66b':
  Bump libnfc-nci version for M.