tree cc0f9e04f9ad32e3b3c645066158e9ff565fab21
parent 39dad3893c9627cc66d28cef6420212124f71729
parent b37200637d4ee83679be1cd23c3e5ae809fde78b
author Tony Wickham <twickham@google.com> 1497636266 +0000
committer android-build-merger <android-build-merger@google.com> 1497636266 +0000

Merge "Animate badge after folder closes" into ub-launcher3-dorval-polish
am: b37200637d

Change-Id: I006e7520aa2b9559565c356af6021e2be0786fff