summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-08-23 17:52:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-23 17:52:41 -0700
commit1f4f571329dc55575dfa5d19174799b2092848c9 (patch)
tree85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp
parenta73e14ee506a5f2380df94dfab2acaf0dc77f609 (diff)
parent63301fe5b095c991f041574c4023d46af48c4391 (diff)
am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp * commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196': Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions