OSDN Git Service

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

Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc