diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-08 14:34:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 14:34:41 -0700 |
| commit | 55946fa9b5c4078f0b0320832280a949012f9e28 (patch) | |
| tree | 9729818ea7b20b4aff7e0717c79cccaf6608f811 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eded617eb4b2c752c10e83232233bb2c217a426a (diff) | |
| parent | 955566417ba1bc556a85e7385681c0aed54d3b14 (diff) | |
am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp
* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
People holding partial wake locks now get blamed for CPU usage.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions