tree 657c86793e17572c5c75f00ad492a37a52f608f2
parent 0ff9af2ecbf6745dba417bff276a777f181033ac
parent 2b3a47b9ce0f422323395286937944a2afa51ed6
author Jeff Sharkey <jsharkey@android.com> 1361484953 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361484953 -0800

am 2b3a47b9: Merge "Allow L2TP traffic to lockdown VPN servers."

* commit '2b3a47b9ce0f422323395286937944a2afa51ed6':
  Allow L2TP traffic to lockdown VPN servers.