diff options
| author | Konstantin Lopyrev <klopyrev@google.com> | 2010-08-25 17:37:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 17:37:45 -0700 |
| commit | f8a7953ff8f3cb0fef652683b2edeb2cf91b5a87 (patch) | |
| tree | 1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c59c76339c8f7d7f6cf355cda88b2ef333b959f7 (diff) | |
| parent | 7c4f53c69a52f52f5f02e26c3be61e2946114cf7 (diff) | |
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 '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp
* commit '6947cc594276df899a0c4662224455f40846bd0a':
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.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions