resolve merge conflicts of b789dfc04a to nyc-dev.
Mitchell Wills [Wed, 10 Feb 2016 22:53:48 +0000 (14:53 -0800)]
Change-Id: I24c30df101b2df1697792f51f9f38a14b3f0e4e7

1  2 
bcmdhd/wifi_hal/gscan.cpp

@@@ -1815,4 -1768,4 +1768,3 @@@ wifi_error wifi_reset_passpoint_list(wi
  {
      return wifi_cancel_cmd(id, iface);
  }
--