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

* commit 'cb2e6510ca4c53582c8294956a4afa5208eb75f9':
  fixed vertical parallax