tree f622e1b30e33097ff866705c7f3738e3dc55e0ad
parent 1d599da8424cef8d07cb4c533bd212d992d8f676
parent a9294eb1c9c090f5c896c0212efed0234678d970
author Sreeram Ramachandran <sreeram@google.com> 1405028696 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405025699 +0000

Merge "Allow a VPN to be declared bypassable."