summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Dave Burke <daveburke@google.com> 2011-11-04 12:04:08 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-04 12:04:08 +0000
commitd40e8d7923755ac46520fdf8981685f8a4c13859 (patch)
treeefd4d1bad284b1432f9cf7aea7b319c50e65c797 /opengl/libagl/TextureObjectManager.cpp
parente71d620d70446ebb073cae4b11a6ba49fa599ae5 (diff)
parent14c82e0af978d280c3bc4aa1075842edca68622c (diff)
am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf': DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions