Adam Powell 243657993c resolved conflicts for merge of db81dc72 to master ...

Change-Id: Ie7e1d9a255934e45d8b241b15e9674046cff2444

2011-12-07 18:18:58 -08:00

..

assets

…

res

resolved conflicts for merge of db81dc72 to master

2011-12-07 18:18:58 -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

…