Automated import from //branches/donutburger/...@141711,141711
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 6a6a811..7e5fdbe 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -492,6 +492,7 @@
 status_t CameraService::Client::startRecording()
 {
     if (mMediaPlayerBeep.get() != NULL) {
+        mMediaPlayerBeep->seekTo(0);
         mMediaPlayerBeep->start();
     }
     return startCameraMode(CAMERA_RECORDING_MODE);
@@ -533,6 +534,7 @@
     }
 
     if (mMediaPlayerBeep.get() != NULL) {
+        mMediaPlayerBeep->seekTo(0);
         mMediaPlayerBeep->start();
     }
     mHardware->stopRecording();
@@ -733,6 +735,7 @@
 
     // Play shutter sound.
     if (client->mMediaPlayerClick.get() != NULL) {
+        client->mMediaPlayerClick->seekTo(0);
         client->mMediaPlayerClick->start();
     }