merge from open-source master

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

Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)

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

Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
diff --cc src/com/android/settings/ApplicationSettings.java
Simple merge
diff --cc src/com/android/settings/vpn/VpnSettings.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
		1	2
src/com/android/settings/ApplicationSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/vpn/VpnSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history