tree cbc749334c5a9216cf1cb3269b62a3b6b6b378cf
parent 748b41585be764c8c37fa73e3fd5c1a0fe8eb03a
parent ccf0561da803190f9219e07b2b2f48c2c7e3c94e
author Sunny Goyal <sunnygoyal@google.com> 1501103101 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501103101 +0000

Merge changes from topic 'am-fd2e1243-0e42-4b1e-ac82-e4f4460e1932' into ub-launcher3-master

* changes:
  [automerger] Adding spring effect for folder icons when dragging similar to adaptive icons am: e29897f503
  Adding spring effect for folder icons when dragging similar to adaptive icons