commit cf8b350d98fc7b3e572937aa14d9bf4bf058ebb9
author The Android Automerger <android-build@android.com> Fri Feb 24 11:26:12 2012 -0800
committer The Android Automerger <android-build@android.com> Fri Feb 24 11:26:12 2012 -0800
tree 881143c99301d59db4a2848f361781b2bba99af1
parent 56d9b8481df7e4c2a17ed743dd6c8dac083583ad
parent 1429c6df4d06bfdc36cfa4f7a598f313289e8cd7

merge in jb-release history after reset to master

mac80211/wpa_supplicant_lib/Android.mk

diff --git a/mac80211/wpa_supplicant_lib/Android.mk b/mac80211/wpa_supplicant_lib/Android.mk
index 6dde819..541d8bd 100644
--- a/mac80211/wpa_supplicant_lib/Android.mk
+++ b/mac80211/wpa_supplicant_lib/Android.mk
@@ -12,7 +12,7 @@
     WPA_SUPPL_DIR = external/wpa_supplicant_8/wpa_supplicant
 endif
 
-include $(WPA_SUPPL_DIR)/android.config
+include $(WPA_SUPPL_DIR)/.config
 
 ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
   CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y

wl1271/wpa_supplicant_lib/Android.mk

diff --git a/wl1271/wpa_supplicant_lib/Android.mk b/wl1271/wpa_supplicant_lib/Android.mk
index 6fb1ec9..35fdae5 100644
--- a/wl1271/wpa_supplicant_lib/Android.mk
+++ b/wl1271/wpa_supplicant_lib/Android.mk
@@ -44,7 +44,7 @@
 CUDK	= $(DK_ROOT)/CUDK
 LIB	= ../../lib
 
-include $(WPA_SUPPL_DIR)/android.config
+include $(WPA_SUPPL_DIR)/.config
 
 INCLUDES = $(STAD)/Export_Inc \
 	$(STAD)/src/Application \