commit 8be8e9a68c96b6cf43c08a58e7ecd7708737c599
author The Android Automerger <android-build@android.com> Fri Dec 16 12:01:36 2011 -0800
committer The Android Automerger <android-build@android.com> Fri Dec 16 12:01:36 2011 -0800
tree 38fe66ecc4978be222f1bdf2609f31e5eb73b2ec
parent 82a05e51a21a093bab579f8af8b4b8bec0542f90
parent 06f7eae2a4eeb30fea78fce0e176635952646075

merge in ics-mr1-release history after reset to ics-mr1

camera/OMXCameraAdapter/OMXExif.cpp

diff --git a/camera/OMXCameraAdapter/OMXExif.cpp b/camera/OMXCameraAdapter/OMXExif.cpp
index 9744cf4..4c5e555 100755
--- a/camera/OMXCameraAdapter/OMXExif.cpp
+++ b/camera/OMXCameraAdapter/OMXExif.cpp
@@ -333,7 +333,7 @@
          if ( OMX_TI_TagReadWrite == exifTags->eStatusDateTime )
              {
              int status = gettimeofday (&sTv, NULL);
-             pTime = gmtime (&sTv.tv_sec);
+             pTime = localtime (&sTv.tv_sec);
              if ( ( 0 == status ) && ( NULL != pTime ) )
                 {
                 snprintf(( char * ) sharedPtr, EXIF_DATE_TIME_SIZE,
@@ -533,7 +533,7 @@
 
     if ((NO_ERROR == ret)) {
         int status = gettimeofday (&sTv, NULL);
-        pTime = gmtime (&sTv.tv_sec);
+        pTime = localtime (&sTv.tv_sec);
         char temp_value[EXIF_DATE_TIME_SIZE + 1];
         if ((0 == status) && (NULL != pTime)) {
             snprintf(temp_value, EXIF_DATE_TIME_SIZE,