tree e3a88f6cfab339789097fa6a08509494b6945f71
parent 9a5abd5d0869f44a8ec5b09fe3e15e7bf9e90a8f
parent 508eff3cfade943e6c5f2a535b4e9996d259cfef
author Martijn Coenen <maco@google.com> 1513205046 +0000
committer android-build-merger <android-build-merger@google.com> 1513205046 +0000

Merge "Configure nfc device node through .conf file" am: aeacb8fcb7 am: 6d8922f4e7 am: 7357630064 am: 5bf84b1a78
am: 508eff3cfa

Change-Id: I2e7e7ff40c94e8e92c87ebd013f42fcbb85f2759