diff options
| author | Jim Miller <jaggies@google.com> | 2011-01-29 11:00:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-29 11:00:28 -0800 |
| commit | d53a94a93b54d7e09fdabeda5b19d286cd84501c (patch) | |
| tree | b60da6c8c40f73796fb700626b8917375c7b4041 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | da285cf1408614cb0351e017eb63e7d1d88048fc (diff) | |
| parent | ddccfdc3d464d4930957d49c100e066120f474b9 (diff) | |
am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions