summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2010-10-01 11:35:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 11:35:37 -0700
commitb4e996822d413f8be45997fc304c0a0b0a835c2b (patch)
tree69f33d22b47959c9522cfef749a5057131aa68f9 /opengl/tests/gl_basic/gl_basic.cpp
parent70be7537771dc0a1c2e0db4ee1e420d03cb55687 (diff)
parentb4d2dfb95c8ed0fe7d6c6db61bbc5e0882884d20 (diff)
am 797bb4f8: am 73db5f02: Merge "Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)" into gingerbread
Merge commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545' * commit '797bb4f83dfcaf263c72b760dfa279e3fbb8d545': Fix bug #3055578 ("adb shell bmgr list sets" generates NPE and cannot be run again when device has no account setup)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions