OSDN Git Service

Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
authorRobin Lee <rgl@google.com>
Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 May 2016 21:05:55 +0000 (21:05 +0000)
commit48b18f4fa994e201e3eb4cca1e7c823b198359c5
tree3d09c48defba39b880ba29968a282036a983175f
parenta5e6601ad1db77563038946ed1316134f7e55ee6
parentdbf0210f6f79a459ed6070c8b1859584a7ccfb12
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
services/core/java/com/android/server/ConnectivityService.java