tree 654702ac9819d7254bcd22c0b71a9212b5f26a25
parent d4588818195744baab5da5365c4d63ff785ee842
parent 010bb273a58444f907bb82f62f8d7274f9637b49
author Daniel Sandler <dsandler@android.com> 1320689600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320689600 +0000

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.