tree ace52c8de0b459b8d8a145960ab5a0182fac8973
parent ad7830586299906bd0b1f653e0a8ea1128c16a8c
parent 4043b05cdef4e713b57f76e532539ead7e7c2ba6
author Tony Wickham <twickham@google.com> 1534541050 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1534541050 +0000

Merge "Cancel badge scale anim when setting new badge scale" into ub-launcher3-master