tree fc106039018eb5eaff0eab2fe1e2ed6186cabf33
parent b8e214f74707f63cdcb280c3dca40c0662624fa2
parent 5d30d86372163a9513aba828bdafab42e5d1099b
author Robin Lee <rgl@google.com> 1492813471 +0000
committer android-build-merger <android-build-merger@google.com> 1492813471 +0000

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

Change-Id: If94864a6320af8ae69777abca0483ce62ff2ebc9