tree fc7fc0c14ceeb9811298b19197bc9c132a78883a
parent 24692d6c9e35e99ec77f5fb57c53bfeef30315a1
parent d0a254566f5f0be5607b4d64839a575c888c94f6
author James Dong <jdong@google.com> 1321938535 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938535 -0800

am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1

* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
  Fix log spamming during time lapse video recording