summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-08-25 19:28:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 19:28:45 -0700
commit319741d31b67529274a1f1b3289b5afcf5a4a69c (patch)
tree6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp
parent27b09d51fb5d049a194ef8c0f9bac308815a2cac (diff)
parentcf1475b007fac2298ab1d9d0b250b40ef41b638a (diff)
am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a' * commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a': Add dynamic uid info for tracking the sip service usage.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions