tree 17c5a45ff12ecd605526114bff79bb73bcb8b1da
parent 1f0c9ea984b94fd2a43e4ebc69b77d2a1c56d784
parent 2eb4ed53c10154d49f4ea64a8fade0f5a136ef72
author Mathias Agopian <mathias@google.com> 1277780781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277780781 -0700

am 5d31a452: am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread

Merge commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7'

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