tree 9b2f5f8e5cf69535aa02046cc7a12c7e9b93718d
parent 70333cca56fd766555e46395e6d9a64c8d82ff49
parent 94eda03f76175dee88cf7941fcbdb6aec43a0d5d
author James Dong <jdong@google.com> 1296082163 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296082163 -0800

am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb

* commit '8bea1d5585822bb62996e789f59c7629dfd9ac50':
  Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.