tree 10e9d8b8927be9a0a340a32745b01d8d718ad2b7
parent 1475d5ea3d69954ed568cc23d2bdb4f9fb57f897
parent 51f48a24337ab849d29045fd70fd982a4520d5ae
author Michael Jurka <mikejurka@google.com> 1294805323 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294805323 -0800

am 51f48a24: am 340c5f3a: Restore wallpaper parallax

* commit '51f48a24337ab849d29045fd70fd982a4520d5ae':
  Restore wallpaper parallax