diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-08 14:38:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 14:38:20 -0700 |
| commit | c1c14d5f3ac3f101c2f33cb0b14dae2aa5d5507c (patch) | |
| tree | 5625a7b7cb55d7110ae1f6ede1b8ad61f532447e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 22599ab3422fc9eaced1438f78e1c5a2713f36b0 (diff) | |
| parent | 55946fa9b5c4078f0b0320832280a949012f9e28 (diff) | |
am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '5fdacb8a2818136218afdea4308ad1b10049a201'
* commit '5fdacb8a2818136218afdea4308ad1b10049a201':
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