tree bb84a66ab85fb072f9d6d33a68c7c34c513ba7b2
parent c0997b0e6291d7c97963623eed2a41994a7855cf
parent 42c0c9f35a8efa71703f810ce2bff6d86bb5b30e
author Jeff Sharkey <jsharkey@android.com> 1361471596 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361471609 +0000

Merge "Allow L2TP traffic to lockdown VPN servers."