tree eebbb55a59e3c5927cb7d75dcfb449220e75dc1f
parent 96725326149687168937cf62f75364cf9cc3e96b
parent f0562b4b071b74a760ad9c9caa0e41687ae6f407
author Mathias Agopian <mathias@google.com> 1277780663 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277780663 -0700

am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread

Merge commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407' into gingerbread-plus-aosp

* commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""