diff options
| author | Eric Olsen <eolsen@android.com> | 2010-03-31 10:12:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 10:12:26 -0700 |
| commit | 76fe6c5c90d81128a2e78d996085a5ec237acec0 (patch) | |
| tree | 8652850ea1b71670da1d7dd4420a16676827c007 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 674fd6f5a172476984af2ad63b30e08546d553ec (diff) | |
| parent | 2ea66597ef3f1f5e9f556c8acc88597436f10bfb (diff) | |
am f26cf98f: am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Merge commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9' into kraken
* commit 'f26cf98ffa087670a5ad849d7dd3c568d4f03ec9':
Add thermal shutdown. If battery temp >= 68C.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions