tree 21504211ac3db84ebca9f5a47f7ae4e2ebfc97fb
parent ff828d2f243f845041d640ce59f76e2963b3fbc8
parent 70a2a7dcac83d56983203701448fe25d6ed60eda
author Tony Wickham <twickham@google.com> 1574244668 -0800
committer android-build-merger <android-build-merger@google.com> 1574244668 -0800

[automerger skipped] Merge "Move shelf peeking anim code to ShelfPeekAnim class" into ub-launcher3-qt-future-dev
am: 70a2a7dcac -s ours
am skip reason: change_id I5ba501b04b3eaf12a20ba1312ef362f9734761c3 with SHA1 85d6f25016 is in history

Change-Id: Ie23add1cbd181cc6d84f00f3f9d7c3a107c5589d