summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-05-29 09:00:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-29 09:00:21 -0700
commit6204195ffadc7895ce70c52edc8506ecabc0159d (patch)
tree29672e361f7c6f3e6cc4db311b837f040101a649 /opengl/tests/gl_basic/gl_basic.cpp
parent81434ee171bb9989a0565082fc41a301a285b2f8 (diff)
parent7555e549c094e7edda71b91d6e217de5e4fe4a67 (diff)
am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9': Fixing concurrency issue on IccPhoneBookInterfaceManager.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions