Automerger Merge Worker 7846b824e0 Merge "Add separate user consent for Platform VPNs" am: ede31cad1c ...

Change-Id: I38ceff087e37f6ede6819e706c36ee9129a1cc6b

2020-02-05 00:07:41 +00:00

..

res

Import translations. DO NOT MERGE

2020-01-31 23:32:16 -08:00

src/com/android/vpndialogs

Add separate user consent for Platform VPNs

2020-02-04 21:05:36 +00:00

Android.bp

Convert Android.mk file to Android.bp

2019-02-08 15:13:25 -08:00

AndroidManifest.xml

Add separate user consent for Platform VPNs

2020-02-04 21:05:36 +00:00