tree fa9f2817ecf1dd155cc9f8d52a5d59270b742e61
parent 99ddc258f6e13501bb0022b374ec30e96670fb1c
parent 72e42791d602ad5f5923ba6bed30b9dac9fe07e8
author Marco Nelissen <marcone@google.com> 1291203311 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291203311 -0800

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

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