summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2010-05-06 12:43:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-06 12:43:52 -0700
commit76289d8b0f3687d79869700787c61e8c17c47d43 (patch)
tree95f571bce595bd01cee3160711fcbb447afa3fc5 /opengl/tests/gl_basic/gl_basic.cpp
parentbbe5688c3ea3ccf71725333d747af4d2fdad5ee0 (diff)
parentafa867debe1e57a91955ffc77a569fdca0d19b0d (diff)
am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '89ad07b048ff035394596d6a8916f639f3f0b868' into kraken * commit '89ad07b048ff035394596d6a8916f639f3f0b868': For issue #2651381, allow library prelinking.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions