am 57c70146: am f854e077: (-s ours) Merge change I8134d6ed into eclair

Merge commit '57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp

* commit '57c701463f57ea50f6116690641f376e84c4c290':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.