tree b21a43612c5d1debb36d22ccbbd50a5093636c8a
parent 28399df9d938071de71ce1d2b0f4853cd34e24c7
parent 41342e8326e89b132cc4933475c529023dd0c782
author Dianne Hackborn <hackbod@google.com> 1323110716 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323110716 -0800

am 803caff1: am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1

* commit '803caff1dc307a8895e9f3560112f969fa3f6f39':
  Fix issue #5614559: Registering surface error in...