diff options
author | Amith Yamasani <yamasani@google.com> | 2009-11-18 13:10:53 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-18 13:10:53 -0800 |
commit | df5df70f64947573624572317e2cce33887625c0 (patch) | |
tree | 869cc209a508d8d45655bb1940bf8ad6f4d97767 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 93c0b5cb9b64bf1cffea1f5b8d0ecb1c69ab358f (diff) | |
parent | a42402d05ea580b8e6e712bc599af6b8f96395b5 (diff) |
am 778f1e65: Merge change Icfc893d2 into eclair
Merge commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d' into eclair-mr2
* commit '778f1e65a5ea37bc4adc4725e281a34b775bc72d':
Fix for 2267410 : Battery use doesn't show CPU usage on non-wiped devices
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions