tree 3c2a7b795973a15fb1d06a50b2bdab6d20beee24
parent b7a6423ce4b54926a3c107f6b403e4e7d26cabca
parent e125891042ec161e7cbae68a45771ffc8cf296ae
author Treehugger Robot <treehugger-gerrit@google.com> 1512757818 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1512757818 +0000

Merge "Rename libnfc-brcm.conf -> libnfc-nci.conf"