tree 3605cda3087d42df6234c2ca7478090482bf2a9b
parent be6072219018ffc3c1c3b76391bcf2c108a6f236
parent 8fa763284020bddb323ca07060166f72ed1a1c61
author TreeHugger Robot <treehugger-gerrit@google.com> 1528311320 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528311320 +0000

Merge changes from topic "am-5a1fc777-28dd-40a0-967f-68b8f7176b2c" into ub-launcher3-master

* changes:
  [automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2 am: f99417f8bb
  [automerger] Reset state amanger, when switching from state animation to task launch animation am: 0cd2a254b2
  Reset state amanger, when switching from state animation to task launch animation