tree 6e40b3d4a048b01e35ea061773e0730b195c8795
parent 15e3a436de3876f55d9962eaaf7c489f0e147160
parent 9e26fccacc59202912406fe237bd9f11207fd34b
author Tony Wickham <twickham@google.com> 1558555883 -0700
committer android-build-merger <android-build-merger@google.com> 1558555883 -0700

Merge "Fix some issues with shelf jumping/duration" into ub-launcher3-qt-dev
am: 9e26fccacc

Change-Id: Ia310ffbe1f39902d2be371fb9467e72cf87002ee