OSDN Git Service

(root) / android-x86 / packages-apps-Camera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cd9af7 338259f)
am 338259f2: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:49:48 +0000 (08:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:49:48 +0000 (08:49 -0800)
Merge commit '338259f2740ec47ceb26ffa9d89341d1106e61b0' into eclair-plus-aosp

* commit '338259f2740ec47ceb26ffa9d89341d1106e61b0':
  android-2.1_r1 snapshot
  Fix issue 2146863 Generated thumbnail in camera preview mode doesn't work after recording a video.


Trivial merge
packages/apps/Camera
About OSDN
Find Software
Develop Software
Help