tree 476bfc9ac03fc06dbcc25a56760387f964336116
parent 9c1aa73b51acba94ebdb7195fe836f71f6f28685
parent d0050e3b3724c0852e29df3d091fcde9c4daa98f
author Jizhou Liao <Jizhou.Liao@nxp.com> 1515701418 +0000
committer android-build-merger <android-build-merger@google.com> 1515701418 +0000

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

Change-Id: Id0f32c0b38703592a12b28aaece5b7c87fe7dc4b