Commits
Dianne Hackborn authored and The Android Automerger committed d16c8cf1f27
Fix issue #6636731: Mariner animation ring gets stuck Weren't cleaning out any ActivityOptions that are still attached to a finishing activity. Bug: 6636731 Change-Id: If0520bbcbf1d4ce19d46ff769918893cefda9c87