tree 495510fa58b9dfc21c5cbc6127a65234506c119a
parent 0da2a5b85810ad8623d7c3018692667120cd9d67
parent 4f6a95b2bbd3a29dbe9acd1a61bfa9de83a39aad
author android-build-team Robot <android-build-team-robot@google.com> 1525284286 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525284286 +0000

Merge changes from topic "am-60382f80-140d-4281-b905-99472c404e5b" into ub-launcher3-master

* changes:
  [automerger] Increase DELAY_MS for DiscoveryBounce. am: 8d945e497f
  Increase DELAY_MS for DiscoveryBounce.