tree 6ca310606cc8eca244bad34907fd7759836cb772
parent 9edfe7251ad99ee518292245f56d534ffd55c312
parent f8a7953ff8f3cb0fef652683b2edeb2cf91b5a87
author Konstantin Lopyrev <klopyrev@google.com> 1282783262 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282783262 -0700

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.