merge from open-source master

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

Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)

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

Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)
author The Android Open Source Project <initial-contribution@android.com>
Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)
diff --cc media/java/android/media/MediaPlayer.java
Simple merge
author	The Android Open Source Project <initial-contribution@android.com>
	Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)