am 859bc015: (-s ours) am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

Browse Source

* commit '859bc0153e37a7eb65216c0a5f7ea46f5559b453':
  Put screensavers back in the icebox for now. DO NOT MERGE.

...

This commit is contained in:

Daniel Sandler 2011-12-01 06:33:07 -08:00 committed by Android Git Automerger

parent d30bfcd0cf f2e05f1750

commit f73970b7ad

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available