tree 0ff1959c6fa1faf4d46ec4598200bd5c424e2371
parent 5a77f325eca5212d86b2bd338951f25652570ba4
parent 45182ed0e8e0f842aa700012202720757b3c9600
author Ruchi Kandoi <kandoiruchi@google.com> 1480539077 +0000
committer android-build-merger <android-build-merger@google.com> 1480539077 +0000

Merge "nfc: Add nfc-base.h"
am: 45182ed0e8

Change-Id: I2697a8ba298c77b12d3a398fcfff7c633f7959ab