commit | 1cd383626b837ace340293a16b027229a1302a3f | [log] [tgz] |
---|---|---|
author | Daniel Sandler <dsandler@android.com> | Wed Nov 16 22:35:30 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 16 22:35:30 2011 -0800 |
tree | 6612a4783a0af5dacf89a520c8ea80420dc0103b | |
parent | 10c776af119a49660f85bce29309c9042c985d76 [diff] | |
parent | 795bcc13c76284147cb40a9f8dc2307e5c15cde5 [diff] |
am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 * commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc': Activate Dreams (screen saver) when desk-docked.