Robin Lee 8fc4ec1ec4 Merge "Use Vpn rules (not firewall) for always-on VPN" am: dcb162176e am: cd8557d15a ...

am: 4de3794c26

Change-Id: Ic1e96eac68ddc8a713b3c71b5c126cb8b99c59f5

2017-04-21 22:17:15 +00:00

..

android/net

Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f

2017-04-19 11:24:03 -07:00

com/android

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

2017-04-21 22:17:15 +00:00