diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-21 16:10:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-21 16:10:00 -0700 |
| commit | 78c5611eed6198b8d6b562e9df2c7cc1c0020ba1 (patch) | |
| tree | d99c9a2cf3942bcc992bccb299c11c078d3d3f07 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 65b04b87404c4cd2e5512ae8156843afaf91c424 (diff) | |
| parent | 883b3e9206e4a382072609f5816b6906ca042071 (diff) | |
am 865991b0: Merge "Added partial support for repporting sensor activity to IBatteryStats" into gingerbread
Merge commit '865991b075de1df8144426b5c2b2f341e4e33d33' into gingerbread-plus-aosp
* commit '865991b075de1df8144426b5c2b2f341e4e33d33':
Added partial support for repporting sensor activity to IBatteryStats
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions