OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d17289
f5de1db
)
am f5de1db2: Omit PPTP VPNs from lockdown list.
author
Jeff Sharkey
<jsharkey@android.com>
Wed, 19 Sep 2012 18:23:49 +0000
(11:23 -0700)
committer
Android 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