Mike Lockwood b6aabcf6e3 resolved conflicts for merge of 22c140b7 to master ...

Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302

2011-05-18 09:25:49 -04:00

..

assets

Fix spacing issue

2011-02-10 11:33:35 -08:00

res

resolved conflicts for merge of 22c140b7 to master

2011-05-18 09:25:49 -04:00

Android.mk

Update RecentApplications to use shared Carousel widget.

2010-09-03 17:44:57 -07:00

AndroidManifest.xml

Add a new permission for user space VPN applications.

2011-05-16 15:16:58 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…