OSDN Git Service

Merge "Allow disconnecting always-on VPNs" into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 14 Apr 2016 16:58:41 +0000 (16:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 16:58:41 +0000 (16:58 +0000)
commit65aa6563ad139d734faf01e040d7d86d06eb955c
tree8a9cf956c0c8337d55050d46190a5827a84da644
parentedb4856ec1c6d6ab5bafbedf155d0c7d3fca31f6
parent1932aa95d45ec05758ca376d89def368dcd3c921
Merge "Allow disconnecting always-on VPNs" into nyc-dev
am: 1932aa9

* commit '1932aa95d45ec05758ca376d89def368dcd3c921':
  Allow disconnecting always-on VPNs

Change-Id: I53d63ecf276210582baf568dd4fc9c5aa607f8b3