diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 07:46:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 07:46:40 -0700 |
| commit | ee1bed83d82aea87210827537db68d0eb8684bb1 (patch) | |
| tree | a398d0ab58e8063c0617f5e02453318500afe116 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bfc964079c159902c1d5d55cc543fb4e6546419e (diff) | |
| parent | c9fe8110e0a343c832bbd5c57431d32b8a308ba2 (diff) | |
am 1a0b19b3: resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
Merge commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac'
* commit '1a0b19b324eb6631333dcc51d9b92c3b1ead2eac':
frameworks/base/opengl: Add NULL check
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions