OSDN Git Service

Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)
commitc9ac672d85bd9fcadb4ce3b78da932ef953350de
tree1d7c2400ddbece2fddc189abb5902941aed7ca29
parent74ab23803ce5ca12e684ebd410dd039d91e6b261
parent3e343ffd913fe0c408c8a975a9ad442da65a498a
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1
services/core/java/com/android/server/ConnectivityService.java