diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-15 11:38:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:38:47 -0700 |
| commit | 5b1a7245a3fddbf34b9f6acf700d2c215527e852 (patch) | |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a9ae6b680a171ced535eb2cb1b0050f882bc6b19 (diff) | |
| parent | c368573cd11c8a7eb97cc59f3c91636a76af392d (diff) | |
am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'
* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
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