OSDN Git Service

Merge "VPN: cancel always-on notification with new id" into oc-dev
authorCharles He <qiurui@google.com>
Mon, 10 Apr 2017 12:53:29 +0000 (12:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 12:53:29 +0000 (12:53 +0000)
commit5744ea2c0d2111a88bfa75d1a2fb531ba90ed841
tree649be2cce2c99f6791cb59fc589536fbeddebe2d
parent0a6fd9847ce3a2d7eeeb89141570a1330dacdebc
parent4286c5768db16de9f486ca490fe33c253c1a5e06
Merge "VPN: cancel always-on notification with new id" into oc-dev
am: 4286c5768d

Change-Id: I97138fb1b0418a74de0ea41c191f6b9968ab947c
services/core/java/com/android/server/connectivity/Vpn.java