diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-14 12:31:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 12:31:07 -0700 |
| commit | c368573cd11c8a7eb97cc59f3c91636a76af392d (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b51030fbf0f903e1912b4fdbe74ca6cf2b9f3a9c (diff) | |
| parent | 71acc203ede735868a3957023947c6c8fb2f0c2e (diff) | |
am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp
* commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b':
Fix problem where power manager was calling battery stats with bad wl type.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions