Merge commit 'remotes/korg/cupcake' into merge

diff --cc src/com/android/music/MediaPlaybackService.java
index 7aca206,8c1c9db..6c5f1f9
--- 1/src/com/android/music/MediaPlaybackService.java
--- 2/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@@ -905,15 -977,8 +977,14 @@@ public class MediaPlaybackService exten
       */
      public void play() {
          if (mPlayer.isInitialized()) {
 +            // if we are at the end of the song, go to the next song first
 +            if (mRepeatMode != REPEAT_CURRENT &&
 +                mPlayer.position() >= mPlayer.duration() - 1) {
 +                next(true);
 +            }
 +
              mPlayer.start();
              setForeground(true);
-             mWasPlaying = true;
  
              NotificationManager nm = (NotificationManager)
              getSystemService(Context.NOTIFICATION_SERVICE);