tree b10bbd94f7ee2ddf89fff7ce8749d62e75a3fc8c
parent 7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f
parent 293f861aab64a0dbae00bb33c90e6e565a7fabfc
author Daniel Sandler <dsandler@android.com> 1321511730 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321511730 -0800

am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1

* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
  Activate Dreams (screen saver) when desk-docked.