OSDN Git Service

Merge "Wifi-HAL: New NAN Discovery engine changes" into mm-wireless-dev
authorEtan Cohen <etancohen@google.com>
Wed, 27 Jan 2016 18:55:23 +0000 (18:55 +0000)
committerAndroid Partner Code Review <android-gerrit-partner@google.com>
Wed, 27 Jan 2016 18:55:23 +0000 (18:55 +0000)
commit8abbec7396ed1bd03d0e078b2672fce3ae3575ae
treef00ed1a3cab37dfe651452430324c4e41d8aec8a
parentfc78eb998e8478a3fa3e16263dd0aa80946ba591
parentfd3a4acb3b1be41cd477d9ebd1474c152420a688
Merge "Wifi-HAL: New NAN Discovery engine changes" into mm-wireless-dev
include/hardware_legacy/wifi_hal.h