Merge "Wifi-Hal: Fix Nan capabilities mismatch"
am: dfea8785ae

Change-Id: If931d718043b0972d46a53c7d3d3b69f9299ecd8
tree: 4823492dbce8b490dec31f367dce295b224eca5b
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk