tree f73a8b8f265072d18ae12451b6b874afcd2a44c3
parent 2653a7db77731987c471b7115bc74c594be00c1b
parent 136cbc54bb2f34026a598846dbf429f5fb40b9ac
author Tony Wickham <twickham@google.com> 1558562835 -0700
committer android-build-merger <android-build-merger@google.com> 1558562835 -0700

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

Change-Id: I002029f2d31bf0c921ddbcc807e294f44d982c9d