tree 34ec37bcf02806490bc20b0bcea8fe02874bd39d
parent 0d4b8bd024837c2a30ee70e5e71c6e674c6b579a
parent 967d36c02eca4ae3af6dcd93ac9c7ffd6401aea5
author Pannag Sanketi <psanketi@google.com> 1318978840 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318978840 -0700

am 967d36c0: Merge "Add timelapse recording support to effects mode." into ics-mr0

* commit '967d36c02eca4ae3af6dcd93ac9c7ffd6401aea5':
  Add timelapse recording support to effects mode.