diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-07 10:11:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 10:11:52 -0800 |
| commit | 70404410dbd8c509c4e0ebdfef7001d1353afcb9 (patch) | |
| tree | 819b82d38d9ee5b6510adca31f7a69d42d981b85 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2642a74b9943069b8d4182dbec8f7681c6f0ae13 (diff) | |
| parent | 9fbfb87f2db057a589c550c335a6be74042b0d49 (diff) | |
Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
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