OSDN Git Service

am f5de1db2: Omit PPTP VPNs from lockdown list.
authorJeff Sharkey <jsharkey@android.com>
Wed, 19 Sep 2012 18:23:49 +0000 (11:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Sep 2012 18:23:49 +0000 (11:23 -0700)
* commit 'f5de1db28a61d159e62ef42f64a2cdcb316d0c2c':
  Omit PPTP VPNs from lockdown list.


Trivial merge