Daniel Sandler 2a40d0d92b Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

2011-12-01 06:29:53 -08:00

..

assets

…

res

Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

2011-12-01 06:29:53 -08:00

Android.mk

…

AndroidManifest.xml

Merge "Unhide social stream permissions." into ics-mr1

2011-11-17 12:26:17 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…