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:57:47 +0000 (18:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jan 2016 18:57:47 +0000 (18:57 +0000)
commit18fad5ac0fdf7ceac53b05b27b00ed36fac47552
tree9a3e74dec4424765c6d5e1c5023b3faf6b45f4ee
parent3fe9a6c111cb74e75319c99480783062313c0d84
parent8abbec7396ed1bd03d0e078b2672fce3ae3575ae
Merge "Wifi-HAL: New NAN Discovery engine changes" into mm-wireless-dev
am: 8abbec7396

* commit '8abbec7396ed1bd03d0e078b2672fce3ae3575ae':
  Wifi-HAL: New NAN Discovery engine changes