diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 09:06:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 09:06:52 -0700 |
| commit | 68f73555d5371809e9f0ebe8edbfbd691c80a654 (patch) | |
| tree | de30c854a07ca8eb3eb435e8437fb70e2c3d5dc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6f49ef82eb563acefa3972c9905a982867f84b38 (diff) | |
| parent | dfc97b4aa1aa89f3ad36606f749ac1a01c10dfe6 (diff) | |
am ddbcce3a: Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit 'ddbcce3afbb38680fb84583f7bad5209307e6459'
* commit 'ddbcce3afbb38680fb84583f7bad5209307e6459':
Keep track of remaining fd when devices are removed
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions