commit b68741bc9da2c0dd0998d311a30674584175ee11
author The Android Automerger <android-build@android.com> Mon Apr 02 07:02:22 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Apr 02 07:02:22 2012 -0700
tree e17480420c41bd432fbb3d23ecbbce104782c808
parent 1ec2bd91deac8778bea6a821fd65e486ede0e012
parent 5bbbf5dba9e9488a1e2f2f158462409a18e14131

merge in jb-release history after reset to master

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 669d7f7..5d2bc7c 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -23,7 +23,7 @@
   CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) = y
 endif
 
-include $(LOCAL_PATH)/.config
+include $(LOCAL_PATH)/android.config
 
 # To force sizeof(enum) = 4
 ifeq ($(TARGET_ARCH),arm)

wpa_supplicant/android.config

diff --git a/wpa_supplicant/.config b/wpa_supplicant/android.config
similarity index 100%
rename from wpa_supplicant/.config
rename to wpa_supplicant/android.config