Dianne Hackborn ed60f81940 resolved conflicts for merge of 76450622 to master ...

Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83

2011-06-02 09:20:52 -07:00

..

assets

…

res

resolved conflicts for merge of 76450622 to master

2011-06-02 09:20: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

…