Merge "VpnSettings: pass certificates to racoon directly."

author Chia-chi Yeh <chiachi@android.com>

Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)
author Chia-chi Yeh <chiachi@android.com>
Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Chia-chi Yeh <chiachi@android.com>
	Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 7 Jul 2011 21:29:12 +0000 (14:29 -0700)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history