summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-20 12:55:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-20 12:55:29 -0700
commit0ba08fc3438cf40b509dd9c1961d2986aeb25923 (patch)
tree849c2bad6cc17de4aabbf3d7c77473978f489cc3 /opengl/tests/gl_basic/gl_basic.cpp
parentee4acc392394a91e1672dd5ce829a8cb2f36df79 (diff)
parent047dca2130f10e3cf7b1929e24241315fafe2bad (diff)
am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
Merge commit 'baf72cd79c2a675c2265384eb704067ab24259a7' into gingerbread-plus-aosp * commit 'baf72cd79c2a675c2265384eb704067ab24259a7': DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions