OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1ae363 bcd519d)
am bcd519d2: am f5de1db2: Omit PPTP VPNs from lockdown list.
authorJeff Sharkey <jsharkey@android.com>
Wed, 19 Sep 2012 22:20:25 +0000 (15:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Sep 2012 22:20:25 +0000 (15:20 -0700)
* commit 'bcd519d20c0bb8b3f13aa209bbe6de443c15e262':
  Omit PPTP VPNs from lockdown list.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help