Neil Fuller 93fcfbc8cb resolve merge conflicts of 83c367aa5b to stage-aosp-master ...

am: 8acdb8aa65

Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4

2017-09-20 14:55:08 +00:00

..

assets

…

res

Merge changes from topic "vpn-dialog"

2017-09-19 08:09:45 +00:00

Android.mk

…

AndroidManifest.xml

resolve merge conflicts of 83c367aa5b to stage-aosp-master

2017-09-20 14:55:08 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…