tree fed70a8c775e7ee6af8b9d64a3a089e22390e64c
parent 2d65afb7c4e7869c1fafefdfc98fc99014185e3b
parent 8bea1d5585822bb62996e789f59c7629dfd9ac50
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.