commit 4584c1f9d780fd8f2412187c04d592041f4760b6
author The Android Automerger <android-build@google.com> Thu Jul 16 01:04:36 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jul 16 01:04:36 2015 -0700
tree 634fff94a69b7826f8c34c94a775abebcf0f94b3
parent 8af982d029f575a91158cbc870fdc94a70203134
parent fbcfcca9aaea16d5a2f6016bc8a6d89fc84eb706

merge in mnc-release history after reset to mnc-dev

include/hardware_legacy/wifi_hal.h

diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h
index fb3316e..9795315 100644
--- a/include/hardware_legacy/wifi_hal.h
+++ b/include/hardware_legacy/wifi_hal.h
@@ -216,6 +216,7 @@
     wifi_error (* wifi_reset_log_handler)(wifi_request_id id, wifi_interface_handle iface);
     wifi_error (* wifi_set_alert_handler)(wifi_request_id id, wifi_interface_handle iface,
         wifi_alert_handler handler);
+    wifi_error (* wifi_reset_alert_handler)(wifi_request_id id, wifi_interface_handle iface);
     wifi_error (* wifi_get_firmware_version)(wifi_interface_handle iface, char *buffer,
             int buffer_size);
     wifi_error (* wifi_get_ring_buffers_status)(wifi_interface_handle iface,