merge from open-source master

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

Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)

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

Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)
diff --cc core/java/android/text/format/DateUtils.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Fri, 18 Jun 2010 19:46:16 +0000 (12:46 -0700)