OSDN Git Service

Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55
authorRobin Lee <rgl@google.com>
Wed, 4 May 2016 21:49:45 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 May 2016 21:49:45 +0000 (21:49 +0000)
commit6dd792e2cdd6ce2d674f9a7dcd1100a04e6d1318
tree813a7228d8ef9522b27978a9d1d616cc86153eac
parentaa21c1b07af088ac1d106ebad91016dd1fcc29ca
parented5f33740cf0305cd723f4a5415423bf5fa969c4
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 662731fb55
am: ed5f33740c

* commit 'ed5f33740cf0305cd723f4a5415423bf5fa969c4':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I3d924e1e8dd69c2392cd09d8c048de7d96b01f40