tree 1d6a99ac4af0f72fbfd18465abafee1aab83890e
parent 8dbbe115f6c0804f2316c8f0a5ad2ecf1c794bd7
parent 0a92bda3a43ca271ce56aa811865d217511f7653
author Adam Cohen <adamcohen@google.com> 1316821343 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316821343 -0700

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

* commit '0a92bda3a43ca271ce56aa811865d217511f7653':
  Restore gingerbread-style wallpaper parallax