tree f937078f7ce008574a27122548fc9fe8f5fa5f1f
parent ac2614ddd04cfd73555785bcfe90d739e21584c0
parent 5bc04e67f7928eb5a107c2512c7f3d84ab363609
author Sunny Goyal <sunnygoyal@google.com> 1469041666 +0000
committer android-build-merger <android-build-merger@google.com> 1469041666 +0000

Merge \"Protecting QSB scroll while transition animation is running.\" into ub-launcher3-calgary
am: 5bc04e67f7

Change-Id: I9b2ad113e98be073ded9756f055443120f7ae756