OSDN Git Service

Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591...
authorRandy Pan <zpan@google.com>
Tue, 17 Jan 2017 19:21:59 +0000 (19:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 19:21:59 +0000 (19:21 +0000)
commit850e37811ea6adf4ca6bf64b85273c9e4df4f0f4
treee8a6cab67baeebdd6a4715281e396b19310e034e
parentf47a7f5ac9308640399624718806a600bf17d7ce
parentd061cf5f6c13996fc59ee0909729af90fffbd944
Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928
am: d061cf5f6c

Change-Id: I1724e30ef5af246ddf5056533b3bc0321267a505