tree ea54f0994fd8e2b426d676669c5d877c1d15bd8c
parent 54e5da53e555c9c2c08484d9fff33bf75b0df3a4
parent 1d82dd4d128da64989538358655e4288daf15018
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1525978889 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1525978889 +0000

[automerger] Fixing crash when cancelAnimaiton happens while we are aboutto enter long-swipe am: 1d82dd4d12

Change-Id: I70c15e1a83979aa44705c1d6491b950932905ba5