tree 584ba733bb9312eb1133abff3c4215e9d0671ee9
parent 8ee74b71ef4366d5da1e54644f4760824ebe690c
parent 8aeec2c0b2862ee57d8234474c6d4c1722cf7dbe
author Jonathan Miranda <jonmiranda@google.com> 1525891702 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525891702 +0000

Merge changes from topic "am-2cbb68cf-7e12-4b4c-8918-2985468d04c3" into ub-launcher3-master

* changes:
  [automerger] Increase REORDER_TIMEOUT to make it easier for users to create/add to folder. am: 217f0ca2d9
  Increase REORDER_TIMEOUT to make it easier for users to create/add to folder.