diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-02 17:27:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 17:27:31 -0700 |
| commit | bc6f37b5bc6d75a030edb6c5bfc409b5c45d4eb9 (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3acbe562bb60d22daa524cc0c7698eb398621cbb (diff) | |
| parent | 425edcc51741bce13f2f10226b3d2795cda70b17 (diff) | |
am c2e060cb: am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo
Merge commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649' into kraken
* commit 'c2e060cbedaa2371fcc5c909c216c8ceafa4f649':
Potential fix for bug: 2564824 : Device runtime restart in BatteryService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions