tree 5fae06d299780b141ffb847e67d260200a308ec0
parent 08ab84bdee69122209651e507520d53588899ee6
parent f7296c373ac14f194a35f0cc760e6565ddfa13f1
author Winson <winsonc@google.com> 1470168608 +0000
committer android-build-merger <android-build-merger@google.com> 1470168608 +0000

Merge "Adding workaround to jump in wallpaper offsets." into ub-launcher3-calgary
am: f7296c373a

Change-Id: I36654d134451a2593e669bcc92b0ebc2f5bbe9e4