merge from open-source master

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

Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)

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

Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)
diff --cc core/java/android/net/http/HttpsConnection.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)