summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-07 17:29:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-07 17:29:49 -0700
commit115e35fc3b912cecca06ecb18425e37b97f814c5 (patch)
tree4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp
parentf5c77459fa992998345c93c2777c4390b9edc122 (diff)
parented1076e47e1a265ca80d0c769ce9310516b2bbe9 (diff)
am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread
Merge commit '26cb01e880af5f23a58e4336facd30fa7d52581e' into gingerbread-plus-aosp * commit '26cb01e880af5f23a58e4336facd30fa7d52581e': Use explicit intent for installing credentials.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions