diff options
| author | Eric Olsen <eolsen@android.com> | 2010-03-31 10:07:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 10:07:36 -0700 |
| commit | 2ea66597ef3f1f5e9f556c8acc88597436f10bfb (patch) | |
| tree | 3552620b2a0ba895bf41b4587f5199ab7df863b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 659623dd11f07c476d425f385b2f97aeb9a70dbc (diff) | |
| parent | c8e4213d9c2b971dec381b2f9431d90394e29798 (diff) | |
am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit '711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp
* commit '711065587b46ea0279788757c49a273ff796f844':
Add thermal shutdown. If battery temp >= 68C.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions