Merge "WifiHal: NAN error translation changes"
am: 1af864da91

Change-Id: I3aa61c24f716d1b78794a1d499c7d72e315b414e
tree: 01aca3dc715646c7680afd65417e0008a1308cf9
  1. qcwcn/
  2. Android.mk