tree 840100ff899eb3404409cd794f20eef9c5d64e16
parent 1cffc1a5ef0d678457225139daaf3e089c902c21
parent c00a6da6ea2ed16e25afcca1227ff990de2ea130
author TreeHugger Robot <treehugger-gerrit@google.com> 1529091401 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1529091401 +0000

Merge changes from topic "am-c5545bb3-b4fc-4188-890e-09975d70878c" into ub-launcher3-master

* changes:
  [automerger] Immediate 2nd quickscrub should not cancel if same state am: f8fafa2847
  Immediate 2nd quickscrub should not cancel if same state