tree 1e170400873c04e9c154dc9704d58b2c8d38e1c0
parent 15a9614dcdeb58c0e70f266f89223e03372a0304
parent d1593ccdd2992123cc82d7cf943bc8bbae1ebe3a
author Ruchi Kandoi <kandoiruchi@google.com> 1480540134 +0000
committer android-build-merger <android-build-merger@google.com> 1480540134 +0000

Merge "NFC: Add @exports to generate nfc-base.h headers." am: cca3e97d63 am: 5a36ec44f7 am: 16feccc9c3
am: d1593ccdd2

Change-Id: I45233a633c8581e3966dbf4d8d594ec8cf6a959f