tree 871af5c7819d5893537e471bf460f50c479a584a
parent 7d5cea988bdab9a32fe5b21333613042857882f8
parent 373b4913ab5398736551ab718eb8c39d6f76e5d0
author Nicolas Roard <nicolas@android.com> 1273598640 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273598640 -0700

am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken

* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
  Fix the 'wobbling fixed elements' bug.