OSDN Git Service

am 384bd5d6: am 7b11946c: am 9739aeb2: Merge "Indicate WPA_EVENT_TERMINATING event...
authorDmitry Shmidt <dimitrysh%android.com@gtempaccount.com>
Wed, 14 May 2014 00:00:20 +0000 (00:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 May 2014 00:00:20 +0000 (00:00 +0000)
* commit '384bd5d631a9d493d65afac4ce21a751e8cd2c68':
  Indicate WPA_EVENT_TERMINATING event on primary interface.

1  2 
wifi/wifi.c

diff --cc wifi/wifi.c
Simple merge