OSDN Git Service

Merge "Move VPN restriction check into setup dialog" into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 26 May 2016 23:41:27 +0000 (23:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 26 May 2016 23:41:28 +0000 (23:41 +0000)
commit32ceb9c801a86f901ec8230eec301c30e1deff3b
tree1452a166d4826730f2fbb9d62807e851145a1467
parent0d35765ca343ae7b04df7a93c233e5b6860eec22
parent628ae0d84180c5f7c52725e02506021e532ed252
Merge "Move VPN restriction check into setup dialog" into nyc-dev
services/core/java/com/android/server/connectivity/Vpn.java