Dianne Hackborn ead40eaedb resolved conflicts for merge of cc20b4e3 to master ...

Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4

2011-06-03 15:01:49 -07:00

..

assets

Fix spacing issue

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

res

resolved conflicts for merge of cc20b4e3 to master

2011-06-03 15:01:49 -07:00

Android.mk

…

AndroidManifest.xml

Add a new permission for user space VPN applications.

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

MODULE_LICENSE_APACHE2

…

NOTICE

…