tree f434c52e8ca1cb3f299a4400191596fe8ee3cc01
parent f190360b76f279ce50a53553cc2781104379e42d
parent c38d6d4ec4ae280192b854719fa247760c457b2e
author Andreas Huber <andih@google.com> 1349214253 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349214253 -0700

am 805b3ae3: Merge "Now back to 30fps, suspend updates if surface flinger didn\'t send us" into jb-mr1-dev

* commit '805b3ae300ea414ce5973e60a9b544169da0ac44':
  Now back to 30fps, suspend updates if surface flinger didn't send us