am c538b651: Fix some UI flow issues when the keystore is locked in WiFi setting.

author Chung-yih Wang <cywang@google.com>

Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)
author Chung-yih Wang <cywang@google.com>
Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)
diff --cc src/com/android/settings/wifi/AccessPointDialog.java
Simple merge
diff --cc src/com/android/settings/wifi/WifiSettings.java
Simple merge
author	Chung-yih Wang <cywang@google.com>
	Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 30 Jul 2009 23:05:19 +0000 (16:05 -0700)
		1	2
src/com/android/settings/wifi/AccessPointDialog.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/WifiSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history