OSDN Git Service

Merge "VPN: uncheck lockdown if always-on is off" into oc-dev am: 73455096d7
authorRobin Lee <rgl@google.com>
Thu, 30 Mar 2017 18:06:45 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 18:06:45 +0000 (18:06 +0000)
am: a0e34f020a

Change-Id: Ic95e31908525fb12c83e010352260d42cc2738b0


Trivial merge