diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-07 18:15:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-07 18:15:30 +0000 |
| commit | 4f631bbf97fd02c9b33e5678149627ba2c9f1912 (patch) | |
| tree | 0c69a8fd72c1dc869832ae5b6594f4e26e3b84dd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9829cceca11a0fc92ab1318ce32b4d4dae8d347d (diff) | |
| parent | 010bb273a58444f907bb82f62f8d7274f9637b49 (diff) | |
am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions