Merge "Rename libnfc-brcm.conf -> libnfc-nci.conf" am: cddea04f14 am: 2c61c0098d

am: f4fcd90e9a  -s ours

Change-Id: I1b7390ff769d129f4f2df76cb6563c83d0d0d03f
This commit is contained in:
Andre Eisenbach
2017-12-08 18:52:52 +00:00
committed by android-build-merger

Diff Content Not Available