tree 9d635d3c3dd47d36f6af7b9c5f718b46d3fe3f13
parent 2ef0896fb71d2a3bcde1fff34a8d24c2e74340c2
author Jizhou Liao <Jizhou.Liao@nxp.com> 1435685141 -0700
committer Martijn Coenen <maco@google.com> 1438588348 +0200

Fix conflict vendor proprietary Protocol and Discovery technology definitions

A new configuration option is added.
Vendor should provide their own definition in libnfc-brcm.conf file.

Change-Id: I8204fbb97bcb59ecf7b450b701546646e1952a78