tree b8b94170507994e61c4e99c0edd328e6e65db6c1
parent 83e6107f1dfae8c0df2108fb7ff9e502f76c2516
parent 8b64ab46c9d30b232bbc8d161dbd371a7454aa9d
author Jonathan Miranda <jonmiranda@google.com> 1529018055 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1529018055 +0000

Merge changes from topic "am-a3d615af-02aa-451c-b89c-c1f59300b566" into ub-launcher3-master

* changes:
  [automerger] Fix bug where add to folder fails even when folder creation animation runs. am: 36f6359c21
  Fix bug where add to folder fails even when folder creation animation runs.