tree 4ca5f7818bf42fc9d95848e588c53daaa5fea995
parent 562e15464208abc62d654fe6d2719482937deb15
parent ec7c68cb2b688f76b2957a46d138241390a01d66
author Chalard Jean <jchalard@google.com> 1519997102 +0000
committer android-build-merger <android-build-merger@google.com> 1519997102 +0000

Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: faed85f2b0 am: 331e50f601
am: ec7c68cb2b

Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc