OSDN Git Service

Merge changes from topic "always-on-vpn"
authorCharles He <qiurui@google.com>
Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)
commit692b55390fd5d8e010c6d994bf2dd5dd9849137e
treeff26765e8775367e4ceab8198ad47f87e5baa317
parenta35bbadeba6dd0c319cdbaedf704c768bc9f9a76
parentcc15c7f8c17624faef67f466dd28985904a743b9
Merge changes from topic "always-on-vpn"
am: cc15c7f8c1

Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/net/VpnService.java