summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-06-07 18:32:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-07 18:32:04 -0700
commit0bc0a46ae84de11265ac7d1dbea5e3b28e90936a (patch)
tree0887920207d99f30e942baabae452fbd0b8ca76c /opengl/tests/gl_basic/gl_basic.cpp
parent7db534fac4ff65a5339ed5adaf9cfaa028b39f00 (diff)
parentd1d9047d5c34fb05be08099fa8cd73e4301ee0ff (diff)
am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo
Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into kraken * commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff': Fix issue #2749322: addPackageToPreferred throws SecurityException
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions