diff options
| author | Dima Zavin <dima@android.com> | 2011-11-01 22:32:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 22:32:06 +0000 |
| commit | a9c14ee5136df9199eff18ba23a0051e5f197d80 (patch) | |
| tree | 0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8ee99aad34a1fae6326037243b0879e2095f3ad6 (diff) | |
| parent | 2ea1501028cec6ba0e56f57a77f599749cbe5963 (diff) | |
am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit 'f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3':
BatteryService(jni): properly handle read's return value
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions