diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-05 14:25:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 14:25:31 -0700 |
| commit | fc7838f20476e76f37585c8e91a4f33eccdf052b (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6f88aab01b3a060175bbfa25004bcf8ada0d7aa1 (diff) | |
| parent | 7f5e6620e5c494f2de10301234c56aca4ec61a6a (diff) | |
am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken
* commit '733a2f654934d452b2febf6f80cd1136830758d5':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions