tree f220956dbce1a420b993f4b74afc3367e63f3732
parent c32e307d2a2476d476f43a54ad21fce700115ab7
parent 65b1f6c80930940bb1536d2a922ce8a3f29840e1
author Andreas Huber <andih@google.com> 1349214369 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349214369 -0700

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

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