tree bdefb9e6f16fb8e7d6962a08f4b833574c7baad6
parent 9097e14443767b37ab0831d46c1090a3960d36e1
parent 7c41bf7092b75dba6029cd3bbc842d3a2661b0aa
author Jamie Gennis <jgennis@google.com> 1350518221 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350518221 -0700

am 7c41bf70: SurfaceFlinger: change the animation timeout

* commit '7c41bf7092b75dba6029cd3bbc842d3a2661b0aa':
  SurfaceFlinger: change the animation timeout