am e7565f3c: Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

author Hung-ying Tyan <tyanh@google.com>

Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)

committer The Android Open Source Project <initial-contribution@android.com>

Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)
author Hung-ying Tyan <tyanh@google.com>
Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/SecuritySettings.java
Simple merge
author	Hung-ying Tyan <tyanh@google.com>
	Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/SecuritySettings.java	patch \|	diff1 \|	diff2 \|	blob \| history