tree 670c6dec15b8744129faadfc25d532c03ca76a15
parent 90e3176f6e7cb5b2a0bcf99ed0ca5e693bb28002
parent 080563ad0a9376c96354c552571561ff8df566fb
author Marco Nelissen <marcone@google.com> 1291146464 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291146464 -0800

am 080563ad: When pausing, also cancel the in-progress fade in if there was one. b/3209106

* commit '080563ad0a9376c96354c552571561ff8df566fb':
  When pausing, also cancel the in-progress fade in if there was one. b/3209106