tree 90adfe2e7bc54f65708e2e2ab36d3e99bea7bbab
parent 298f29d84fd348cb2d8a3635656dd25972859d5d
parent 4cd3f2280c03024005456311bc3367c65f2dfa91
author Tony Wickham <twickham@google.com> 1527632165 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1527632165 +0000

Merge changes from topic "am-125d8586-dd81-455b-b3e8-107829f04796" into ub-launcher3-master

* changes:
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c am: 556a97d9d6
  [automerger] Set mState = mCurrentStableState in onAnimationCancel am: 8935d9515c
  Set mState = mCurrentStableState in onAnimationCancel