| commit | f73970b7adfa10ad287db122301b33bfa46c087f | [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 | c908dc021a1ae92fc6402bf7d21813c1938411cd | |
| parent | d30bfcd0cf115f6b0a764d41c6aa9e3b2422c93d [diff] | |
| parent | f2e05f17505f318fed38bc161e3241c31f23f678 [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.