tree 881c4a7ecea8a3be238a85f694c8f3408520754d
parent 0028efe5762e3746b00c31f8f8557c9e9e5b90d4
parent 33f0cd9a31393a10f5dee8dc0f3971336461abd9
author Noriko Yoshida <noriko.x.yoshida@sonymobile.com> 1534296825 -0700
committer android-build-merger <android-build-merger@google.com> 1534296825 -0700

Merge "Callback in NDEF detection when RF is not activated"
am: 33f0cd9a31

Change-Id: I9f61588a11129b812dec929e9534e590541c711a