tree f3bb79285e112e970a7fc3b74c8257c6064e7fa5
parent 3d07ea6eadaa3f45417413f2c9032b92142673f8
parent 5713ff32ea481bf05c95ae553bac8f9dc15b3d92
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"