diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-11-22 12:41:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-22 12:41:57 -0800 |
| commit | f77abf649ea183535daf259875c4f20ad6d1768a (patch) | |
| tree | 3e20c0cffe208a84843bab653b4af0aace91af2c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 627149786fff6911bbedf8b64d04269b2b290bbf (diff) | |
| parent | 7ecd42facf583a5140bcbe2598b34aaea13b6208 (diff) | |
am d61b61d6: am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit 'd61b61d6f97f9f73b86e4a24a747c4451f2bc939':
Fix an NPE on overflow in BatteryStats history.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions