OSDN Git Service

(root) / android-x86 / packages-apps-Camera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0e6636 34aabe7)
am 34aabe7c: am ad9df588: Merge change If3ab51b5 into eclair-mr2
authorOwen Lin <owenlin@google.com>
Thu, 3 Dec 2009 18:52:49 +0000 (10:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Dec 2009 18:52:49 +0000 (10:52 -0800)
Merge commit '34aabe7ca84eb5ddd7edcb1b5d37e6de79928511'

* commit '34aabe7ca84eb5ddd7edcb1b5d37e6de79928511':
  Add check if the media is still recording when the timeup event is comming.


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