tree 3be8f970a60e4b3a15c0778f01dae8313f453230
parent 2dd7aed46972c12375bb420b00d267c44ca1e915
parent b11ee09d99c9a817eade2ee502a0ff4727f15c8f
author Eino-Ville Talvala <etalvala@google.com> 1319736921 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1319736921 -0700

Merge "Fix video capture intent preview alert for effects." into ics-mr1