tree 0211cf5851cd3be8dd78e20cd20eb1eedfe7f3e4
parent e00e693cb0940311d076e4c5242b799c4f04fd48
parent cb2e6510ca4c53582c8294956a4afa5208eb75f9
author Michael Jurka <mikejurka@google.com> 1295050170 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295050170 -0800

am cb2e6510: am 8dcd99ea: Merge "fixed vertical parallax" into honeycomb

* commit 'cb2e6510ca4c53582c8294956a4afa5208eb75f9':
  fixed vertical parallax