tree 476bfc9ac03fc06dbcc25a56760387f964336116
parent 81a2091b43febb6f9185a9ea55e10f7ae349afe8
parent 321268ad225d55db23f2e448303724b2b200cbb9
author Jizhou Liao <Jizhou.Liao@nxp.com> 1515700750 +0000
committer android-build-merger <android-build-merger@google.com> 1515700750 +0000

Merge "Memory leak fix in NFA_SetRfDiscoveryDuration()" am: cb388ef835
am: 321268ad22

Change-Id: I150ff9f6ede5f9165db596b81fc3ee0a60838eef