tree a059ceadbb13bd734b2a851aaa59bda428d7f0d9
parent 7089a4e197bb14b01f4c485304f205dcb730ad21
parent 8a511b9123d9219498a8560b1b19e382ebf8cf61
author Tony Wickham <twickham@google.com> 1442258708 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442258708 +0000

am 8a511b91: (-s ours) Merge "Wallpaper preview parallax matches the actual wallpaper\'s." into ub-launcher3-burnaby-polish

* commit '8a511b9123d9219498a8560b1b19e382ebf8cf61':
  Wallpaper preview parallax matches the actual wallpaper's.