tree bb245bf47f2a229fff3feb92a7f0ad3b4b602cee
parent 5ec7fbd34060fe62a706256dd87c2fbdb3f9a849
parent 556a97d9d66787eac6ec664fffc081adda0b3a0f
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-edmonton-polish

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