resolve merge conflicts of b789dfc04a to nyc-dev.
authorMitchell Wills <mwills@google.com>
Wed, 10 Feb 2016 22:53:48 +0000 (14:53 -0800)
committerMitchell Wills <mwills@google.com>
Wed, 10 Feb 2016 22:53:48 +0000 (14:53 -0800)
commit08f19ae099d35ba8a7dd9e68b6887e202eee42c3
tree8aee3561daa79cf7b999948abe45029ce73f00da
parent5f3a57c0f175b5dea10027e0be6a265eec784750
parentb789dfc04a849d61f0573f6771b5f9bad4cd4f1f
resolve merge conflicts of b789dfc04a to nyc-dev.

Change-Id: I24c30df101b2df1697792f51f9f38a14b3f0e4e7
bcmdhd/wifi_hal/gscan.cpp