tree 1d6a99ac4af0f72fbfd18465abafee1aab83890e
parent b632386c7b86072db0ee4134aced3e8b20b349e3
parent c79c423868dc6442e2dd1c98263a989a0999babc
author Adam Cohen <adamcohen@google.com> 1316821468 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316821468 -0700

am c79c4238: am 0a92bda3: Merge "Restore gingerbread-style wallpaper parallax" into ics-factoryrom

* commit 'c79c423868dc6442e2dd1c98263a989a0999babc':
  Restore gingerbread-style wallpaper parallax