OSDN Git Service

Merge changes I0da0f04f,I93197665 into ics-mr1
authorDaniel Sandler <dsandler@android.com>
Mon, 7 Nov 2011 18:11:52 +0000 (10:11 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 7 Nov 2011 18:11:52 +0000 (10:11 -0800)
commit70404410dbd8c509c4e0ebdfef7001d1353afcb9
tree819b82d38d9ee5b6510adca31f7a69d42d981b85
parent2642a74b9943069b8d4182dbec8f7681c6f0ae13
parent9fbfb87f2db057a589c550c335a6be74042b0d49
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.