tree 2a0cc0ef6466811ac29fe474da890ca15eb9b7fc
parent d495bbdd960d62c3393ae4eea0d7096727fe063e
parent 97dff702b35992d4df2b6e479de857c57835da54
author Dan Albert <danalbert@google.com> 1416253969 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416253969 +0000

am 97dff702: Merge "Move libnfc-nci to libc++."

* commit '97dff702b35992d4df2b6e479de857c57835da54':
  Move libnfc-nci to libc++.