| commit | d2a28b3ee07e27cc374d07b02995fb865474aae7 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Dec 01 06:33:07 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 01 06:33:07 2011 -0800 |
| tree | 5e4b9f41ff3c4e449021e55eb708c98df5883797 | |
| parent | 51340e0fb74a11885b667dc16c9d21a9199211c9 [diff] | |
| parent | 859bc0153e37a7eb65216c0a5f7ea46f5559b453 [diff] |
am 859bc015: (-s ours) am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 * commit '859bc0153e37a7eb65216c0a5f7ea46f5559b453': Put screensavers back in the icebox for now. DO NOT MERGE.