tree 7394996061abf752fae57b255fb859571e74762c
parent b323baf20a5afbb618d26024db20f14491a5d0a3
parent d21fc0cddcea747697af92ce11b4cf0177fabb75
author TreeHugger Robot <treehugger-gerrit@google.com> 1525897606 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525897606 +0000

Merge changes from topic "am-f87bd580-30d6-4da0-89bd-1568b32fd0ac" into ub-launcher3-master

* changes:
  [automerger] Don't end atomic animation when passing through state am: fc564f1477
  Don't end atomic animation when passing through state