tree 31937c9de719182383ea3e551ec9bf56a671c13f
parent ce86e194c41d37b40bd4423bd1954d05bde24840
parent 20bd2c10c1d5ead86f472a7397f060159693e4f4
author Tony Wickham <twickham@google.com> 1442624215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442624215 +0000

am 20bd2c10: (-s ours) am 6ed058cb: Wallpaper preview parallax matches the actual wallpaper\'s.

* commit '20bd2c10c1d5ead86f472a7397f060159693e4f4':
  Wallpaper preview parallax matches the actual wallpaper's.