diff options
| author | Jason Parks <jparks@google.com> | 2010-07-20 14:04:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 14:04:41 -0700 |
| commit | d316e20f7fb4f40b9186f11453fced2e4a0b4ac9 (patch) | |
| tree | 0c919194c090714877b2c62e25984e00b216d760 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 817379ca661582c71ce457eac9b4026f02ccc84d (diff) | |
| parent | 24e0cd34aa41b76df540ab8e98c7d983e9fdf74c (diff) | |
am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp
* commit '29e25bd3418b04e395119bf99abe92898830a796':
Only print out wake locks in the if the wakelock was held.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions