| commit | f2e05f17505f318fed38bc161e3241c31f23f678 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Dec 01 06:31:09 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 01 06:31:09 2011 -0800 |
| tree | 60a86919e626e09690310f1a42282c82c53f52ac | |
| parent | 9d735cbfd6aacb16055a8b870276666a2430ff2c [diff] | |
| parent | 859cdf2328ddfc518cf63576654c76182f9ee771 [diff] |
am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 * commit '2a40d0d92b208021b492e9af3d944720cbf269fc': Put screensavers back in the icebox for now. DO NOT MERGE.