| commit | b1c9efc6fa1f5fb660ccf22b0fb097481016de32 | [log] [tgz] |
|---|---|---|
| author | Bernie Innocenti <codewiz@google.com> | Mon Jun 04 23:08:48 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 04 23:08:48 2018 -0700 |
| tree | e75af138d052a856c33e65e7116fd7d2550334e9 | |
| parent | 048c6751d77ea038b17b8cef4fbfb324f4b6b0f4 [diff] | |
| parent | 254f08bc70499a5212c14375bef0c8e6ffdbc21f [diff] |
Merge "vpn: allow IPSec traffic through Always-on VPN" am: 4d3b5c1d3b am: 254f08bc70 Change-Id: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218