tree 386793bd1dbbc743b3b3c2b11661867bfb206c06
parent e6febedcdf886537aaca63f4ad98f7cbf18abb56
parent 65c6e5f2f2c9a66534022db5f31b7bb854108975
author Sunny Goyal <sunnygoyal@google.com> 1525990566 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525990566 +0000

Merge changes from topic "am-097d6789-c880-4ec5-bad4-39f2d31eb938" into ub-launcher3-master

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