Adam Cohen 8ce22f2644 Fixing a typo in framework widget padding ...

Change-Id: I90733500487b3e9fb1ff19a7b946d6faf526a2c1

Conflicts:

	core/res/res/values-sw600dp/dimens.xml

2011-11-23 16:31:53 -08:00

..

assets

…

res

Fixing a typo in framework widget padding

2011-11-23 16:31: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

…