summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-04-19 11:56:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-19 11:56:19 -0700
commit4d11d18af85525a0db49119296abd1c7bce79687 (patch)
treec5a922a844ec13a0a5c16c639ae0c309be17e8cd /opengl/tests/gl_basic/gl_basic.cpp
parent483e6a2c7e6246b2852a32229a6329c5c2b9423a (diff)
parent092d5f9cbab8b307dbbc3932afcd5e22244d362c (diff)
am 9a9b09f6: am afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b' into kraken * commit '9a9b09f6bd209f9f46370c63cb72ab3460216b3b': Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions