diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-16 22:35:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-16 22:35:30 -0800 |
| commit | a092482c17830b985798d5da9c1d1951735bacf3 (patch) | |
| tree | b10bbd94f7ee2ddf89fff7ce8749d62e75a3fc8c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f (diff) | |
| parent | 293f861aab64a0dbae00bb33c90e6e565a7fabfc (diff) | |
am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
Activate Dreams (screen saver) when desk-docked.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions