tree 871121aa7d94d29d25f28ab10d4aa69cc78f9014
parent 033988dc8772d950ed6926352abae6a700e48774
parent 8bdb01c279828e286a6e8b22ff0c1bcb6aa6ee8f
author Marco Nelissen <marcone@google.com> 1368232530 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1368232530 +0000

Merge "Don't purge effects we're about to start using" into jb-mr2-dev