tree fefcf546c04566bb00ef25c33f74ca16a3af2de5
parent af86c004d287da1926e817fc738c7e9c814e7e3d
parent 4d917a9793ca0abd079859529a9966182d823c58
author Tony Wickham <twickham@google.com> 1474574922 +0000
committer android-build-merger <android-build-merger@google.com> 1474574922 +0000

Merge "Fade deep shorcuts in and out." into ub-launcher3-calgary-polish
am: 4d917a9793

Change-Id: I3e6d8d1e8e74c31bffb166f72d3e3e87f017ffea