tree 1a983efe159642ce79d159aa01aace5ef6c41a6a
parent 04bf5480380da5a91a10deec97c08ce2e43f35a3
parent 217f0ca2d9788a5411fd79c9cc25d88b5f1c7007
author Jonathan Miranda <jonmiranda@google.com> 1525891702 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525891702 +0000

Merge "Increase REORDER_TIMEOUT to make it easier for users to create/add to folder." into ub-launcher3-edmonton