OSDN Git Service

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)
commit11aeb1a98f29ff3525fc8179ce519e4924b754c8
treed70f1431431afa99fc6078e6eae5cd7cd5fb80ed
parentb0e6636c8d46a9d87c5220c3005cb9869ce475f2
parent34aabe7ca84eb5ddd7edcb1b5d37e6de79928511
am 34aabe7c: am ad9df588: Merge change If3ab51b5 into eclair-mr2

Merge commit '34aabe7ca84eb5ddd7edcb1b5d37e6de79928511'

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