summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jeff Hamilton <jham@android.com> 2010-05-27 09:40:23 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-27 09:40:23 -0700
commit9994e682f1d98677ca90987843198d5bcb3135c9 (patch)
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 /opengl/libagl/TextureObjectManager.cpp
parent4a977bd462cc4abb734e6704994cc086cfcb2d58 (diff)
parent5b4069e9584ebcf94742f679b79a2fb836745beb (diff)
am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp * commit 'dc46f6f6cc44954c23229019270b54b8912be825': Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions