commit | 4de3794c2609eab0f89085cb2b038304bdf5cc02 | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Fri Apr 21 22:11:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 22:11:05 2017 +0000 |
tree | aeb13721fdc038030fce623c34e5a5c2d1426029 | |
parent | b4be7093da1608fe776746854eafb6a63382618f [diff] | |
parent | cd8557d15a679992f0b3a69490b16d8876912a19 [diff] |
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a Change-Id: I4e0aa1a88c259b77d7a9ac9e1dd02566e415005d