Daniel Sandler c0fc5d81b8 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.

2011-12-01 06:31:12 -08:00

..

assets

…

res

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

2011-12-01 06:31:12 -08:00

Android.mk

…

AndroidManifest.xml

am 9be49620: Merge "Unhide social stream permissions." into ics-mr1

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

MODULE_LICENSE_APACHE2

…

NOTICE

…