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 | 467e8e13327bd9ad2dbabfa0a9b31f860202c7b1 (patch) | |
| tree | c3dc19f3c5372c9c3d313880cf3a74fa42777cd0 /opengl/tests/gl_perf/fragment_shaders.cpp | |
| parent | 94bf9431e5464c7757890abfe0716997151f153f (diff) | |
| parent | 5fdacb8a2818136218afdea4308ad1b10049a201 (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_perf/fragment_shaders.cpp')
0 files changed, 0 insertions, 0 deletions