tree 03a0a7c8fc88af3522349e778a12b2f884eda698
parent e7c2e03d22cab78775309e87451002f5bc382afd
parent 4de3794c2609eab0f89085cb2b038304bdf5cc02
author Robin Lee <rgl@google.com> 1492813035 +0000
committer android-build-merger <android-build-merger@google.com> 1492813035 +0000

Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a
am: 4de3794c26

Change-Id: Ic1e96eac68ddc8a713b3c71b5c126cb8b99c59f5