Dianne Hackborn 161e67ff3b resolved conflicts for merge of 06a8ceac to master ...

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

2011-05-19 21:44:52 -07:00

..

assets

Fix spacing issue

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

res

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -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

…