| commit | 5d30d86372163a9513aba828bdafab42e5d1099b | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Fri Apr 21 22:17:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 21 22:17:15 2017 +0000 |
| tree | 03a0a7c8fc88af3522349e778a12b2f884eda698 | |
| parent | e7c2e03d22cab78775309e87451002f5bc382afd [diff] | |
| parent | 4de3794c2609eab0f89085cb2b038304bdf5cc02 [diff] |
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a am: 4de3794c26 Change-Id: Ic1e96eac68ddc8a713b3c71b5c126cb8b99c59f5