Peter Ng 876e700841 resolved conflicts for merge of e10462e3 to master ...

Change-Id: I1c5a4fd1573583cd365b375835038e7e4a34f201

2011-10-28 16:09:36 -07:00

..

assets

…

res

resolved conflicts for merge of e10462e3 to master

2011-10-28 16:09:36 -07:00

Android.mk

…

AndroidManifest.xml

Add new permissions for read/write social stream.

2011-10-04 15:35:48 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…