tree 4982cc864aa4f041c5fb17082aed9d7d2a9a1df6
parent f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c
parent caf8466dcdf6d6c496e46961bb3132126363ef83
author Rodrigo Carceroni <carceroni@google.com> 1318626039 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318626039 -0700

Merge "Bug 5383077: handle video thumbnail generation correctly when effects are on" into ics-mr0