tree e4f37719f6e70b9c601640a5dd20c89913d4946a
parent 27654727a970cebfad7d388ec07221a1f20f9027
parent 8dcd99eaf72a2f5233647e2a05757bcfb8f28c28
author Michael Jurka <mikejurka@google.com> 1295050081 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295050081 -0800

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

* commit '8dcd99eaf72a2f5233647e2a05757bcfb8f28c28':
  fixed vertical parallax