diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-04-05 14:20:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-05 14:20:57 -0700 |
| commit | 7f5e6620e5c494f2de10301234c56aca4ec61a6a (patch) | |
| tree | cdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 24b5b5d7b4e0b8881342d39a7500a80bf90bed23 (diff) | |
| parent | 68e9e237c92196f83f1e49dfd80bf26ac169b9ba (diff) | |
am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
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