summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-09 21:34:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-09 21:34:44 -0700
commit87005bc57fcea4d5cb3cabe345127d21d339bef4 (patch)
tree363cfe186972ea21da789fe8c7d457d56df79969 /opengl/tests/gl_basic/gl_basic.cpp
parentca5b069671138a9e3f70b64c363a0b0aefdd0b44 (diff)
parentad70b5ab4b2c304f3b178e446a4a1760aaf87c28 (diff)
am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp * commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859': Add toast when an app intercepts the launch of another app.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions