summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2010-06-15 14:24:51 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-15 14:24:51 -0700
commit9161e1ce2a9b4d115dda9b5b33b5acdf1a3d7078 (patch)
treedb09ecd886d4c41aab785f04ba7350d9b1ca19df /opengl/libagl/TextureObjectManager.cpp
parent70dcdfd24044244ecd7f5aa560fb054def8aa474 (diff)
parentfa5f5bc4a6b1cf6384d6024f39d7b2a3e76f8b29 (diff)
am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp * commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions