| commit | f3c6825207d668c8a0c50faa18f08ae87ae722bd | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Oct 18 00:14:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 18 00:14:56 2012 -0700 |
| tree | 4419ded64158d787a192357d93a48940a411b6d3 | |
| parent | 05d7709e77f27638f96afbceedcb07ee3ef19a0e [diff] | |
| parent | 1d9cebee1451ad5845ea7f4e0f7ab7ff8bb48185 [diff] |
am 1d9cebee: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev * commit '1d9cebee1451ad5845ea7f4e0f7ab7ff8bb48185': Dream when user activity times out while docked if appropriate.