tree 4fde6040c9b57db71ab374a70b507f6d79f6c0d4
parent 0a039136e8e46ddbcb45b55e92d80ddb2ddfc2c2
parent 38b930410fddaee169933ac18e55fdbf5cc51d84
author Eino-Ville Talvala <etalvala@google.com> 1320443089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320443089 +0000

am 38b93041: (-s ours) Fix video capture intent preview alert for effects. DO NOT MERGE.

* commit '38b930410fddaee169933ac18e55fdbf5cc51d84':
  Fix video capture intent preview alert for effects. DO NOT MERGE.