merge from open-source master

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

Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)

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

Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)
diff --cc telephony/java/android/telephony/PhoneNumberUtils.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)