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 | 010bb273a58444f907bb82f62f8d7274f9637b49 (patch) | |
tree | b360d98b3092c285e61637a987538e99b4e177fc /opengl/java/android/opengl/Texture.java | |
parent | 064975c27cbca412e682fa152ce00af14027ab4f (diff) | |
parent | 221733a45a89715d1c627f876ca49eeecd21dc08 (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions