| commit | 11bffe79ff71c922e9391ce9adee4188f9e9490f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri May 10 17:36:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 10 17:36:46 2013 -0700 |
| tree | 8e1870e5af4372a4268db074524eebcd08eb426a | |
| parent | d702ba16a9ca43a36be0f6f198268e5d1466879c [diff] | |
| parent | e743d2ece72a0a7843cb17d2e04c9faaa3570884 [diff] |
am 0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into jb-mr2-dev * commit '0d24eb5e89963663150d38a320ec17244d39edf2': Don't purge effects we're about to start using