summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-27 12:45:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 12:45:31 -0700
commit4308e64d25225f409b649c3dc23ae29da9fa833a (patch)
treef1f0e7831502036b3e854a76778f8c6ae8d6def6 /opengl/tests/gl_basic/gl_basic.cpp
parent601908229ffcd02719030525559b1c222099a56b (diff)
parent7a0090f88aea47b63d897c3ad1c16176dff293b0 (diff)
am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp * commit 'd8691d73d158acd9ffc63748126e822afd656707': Allow all apps to call ContentResolver.getType().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions