tree bab33b5f465661bb12f982222bb678024b0893ac
parent ae64dfb5c34eed73bdc7ada30645ffec003c25fc
parent 02740dc49df86fc94c872454aa9db98737d5e8c8
author James Dong <jdong@google.com> 1321936199 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321936199 -0800

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

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