tree 260d14ffe4f32a9bdd2e7f9ddd4c0a6468b09020
parent e92e99b8eb4903a14ea7bf330afe16f7c54534a2
parent 25e7d67e11c1cff9911f43705b5f0ca306b89402
author TreeHugger Robot <treehugger-gerrit@google.com> 1524160932 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1524160932 +0000

Merge changes from topic "am-3e098e52-a5e6-4050-ac05-724b2c56ff1d" into ub-launcher3-master

* changes:
  [automerger] Linking swipe animate to stateTransition to that it gets properly reset afterwards am: cc35bb88da
  Linking swipe animate to stateTransition to that it gets properly reset afterwards