tree 8c7071fee93514f53d5873b2e744f278bd0e1e03
parent 73b054ae3700cfc5f2ce8e014d4a42b7591a49f1
parent 35e6d6867c63ad254e95325206aa7a927edd6797
author Mathias Agopian <mathias@google.com> 1308253260 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308253260 -0700

am 35e6d686: (-s ours) am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)

* commit '35e6d6867c63ad254e95325206aa7a927edd6797':
  revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)