commit 261d509270d41508ca99d5a1a0d0dd8e7e4bd966
author Konstantin Lopyrev <klopyrev@google.com> Wed Aug 25 17:41:02 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 25 17:41:02 2010 -0700
tree c68ac2471d614cdd6f27c29459b545fde6e1c2f6
parent ebe083efadcc3648fd75c64604ecc40c9a7cefb6
parent 5a54e98022d640900f94102c077d8dff447f3c76

am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread

Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'

* commit '5a54e98022d640900f94102c077d8dff447f3c76':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.