OSDN Git Service

Merge "Fix P2TP VPNs by adding an exception for VPN user." into nyc-dev
authorPierre Imai <imaipi@google.com>
Mon, 16 May 2016 09:07:26 +0000 (09:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 09:07:26 +0000 (09:07 +0000)
commit5092efba9450f01bc632492b09a7445e9520c494
treebf6b2040ad1b418b1bbb80d4cc62aa3a99764296
parent9841f462eee96cbba3d25d32276e0aacfaaa5a92
parent4f88299120b076dc068a67cf0f0343660a2777fa
Merge "Fix P2TP VPNs by adding an exception for VPN user." into nyc-dev
am: 4f88299120

* commit '4f88299120b076dc068a67cf0f0343660a2777fa':
  Fix P2TP VPNs by adding an exception for VPN user.

Change-Id: Ic8528dd6d589f08324ecbc69a4024086e9054a7f