summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-07-30 14:30:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-30 14:30:31 -0700
commite07e4c0a7b144aa7b1f30b12c3a8b128716decd2 (patch)
tree06c991e1b612a9e6517cefbaf13bd492d125c99f /opengl/libagl/TextureObjectManager.cpp
parent8414dc0c4854b110e2b7ea69ef177b08aaecbe70 (diff)
parent1ec47739f61df47dd36fee3607c2777b9e84c198 (diff)
am d973a533: Merge "Lower the lower bound for max file duration check" into gingerbread
Merge commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec' into gingerbread-plus-aosp * commit 'd973a533da16a1fbf13aa1b58ddf60d7d7c9b4ec': Lower the lower bound for max file duration check
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions