diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-09 21:34:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 21:34:33 -0700 |
| commit | 4b9adfdb29ca35654e229825184046ee303fda94 (patch) | |
| tree | 363cfe186972ea21da789fe8c7d457d56df79969 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 09eec2e8690894416e40d19c441b96cf1b45d648 (diff) | |
| parent | faa2348d307da1235354185be741aa69824b7a85 (diff) | |
am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp
* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
Small fixes to battery stats.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions