diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-24 12:17:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-24 12:17:12 -0700 |
| commit | 9873cdfdbccf280d04247d8e899143189b7bd25a (patch) | |
| tree | b91439697851c4acae2590d2a2685614d43537da /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d14928ffcf6563b026d2882dceb050093042ee24 (diff) | |
| parent | 15e14b312dd416df0a7f5c06d1289a87a234c7cd (diff) | |
am 3c1c3d89: (-s ours) am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
* commit '3c1c3d898ca1ade5f8ef0f71ddb928af3a780276':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions