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