diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 15:12:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 15:12:17 -0700 |
| commit | 0259a7534f27d98122bfef94a1bed79c8a12013f (patch) | |
| tree | 9e0b0db64c113d53f6388aadf5fecc623eaf6991 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 58e1173cf0fca167d5e368d869cffb7dc3205c95 (diff) | |
| parent | 4c5355883575b89bc847b5b2dbc32064420335f2 (diff) | |
am 900b6157: merge from open-source master
Merge commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken
* commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff':
Only hold a weak pointer on SurfaceComposerClients
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions