summaryrefslogtreecommitdiff
path: root/opengl/libagl/array.cpp
diff options
context:
space:
mode:
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
commit0c316eeb437a0ac1d6840690be643d1a553f0b23 (patch)
tree1332be4e75217d0cee1e43875ef0977cd9234604 /opengl/libagl/array.cpp
parentfe762e9d127988b736422915ee8bac3d9321a786 (diff)
parentddbcce3afbb38680fb84583f7bad5209307e6459 (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/libagl/array.cpp')
0 files changed, 0 insertions, 0 deletions