tree 476bfc9ac03fc06dbcc25a56760387f964336116
parent 6bef7a09a75f6243ee3bd647bd8284917f2fa7f4
parent cb388ef8358e0abda9242c0d4adc65f43d5372f2
author Jizhou Liao <Jizhou.Liao@nxp.com> 1515700544 +0000
committer android-build-merger <android-build-merger@google.com> 1515700544 +0000

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

Change-Id: I04e52b4e71aec810941be4a03cea4d18b4d0dbce